Changeset 90

Show
Ignore:
Timestamp:
Fri Sep 22 13:29:48 2006
Author:
mbutscher
Message:

branches/stable-1.7:

* Fixed bug: Some problems with non-ascii pathes

(fixed by changing StringOps?.mbcsDec).
* Fixed bug: No selection replacement on Win ME.
* Fixed bug: Renaming of wiki word failed if link
modification was wanted by the user or if page was
not yet saved the first time.


branches/mbutscher/work:

* Support for insertion of pages, relations
(parents, children, ...), saved searches with
multiple columns output for link lists.
* Fixed bug: Some problems with non-ascii pathes
(fixed by changing StringOps?.mbcsDec).
* Fixed bug: No selection replacement on Win ME.
* Fixed bug: Renaming of wiki word failed if link
modification was wanted by the user or if page was
not yet saved the first time.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/mbutscher/TodoList.txt

    r88 r90  
    1   +++ Internal: Reorganize handling of functional keys  
    2   Especially in the editor. The large if/else construction in OnKeyDown is bad.  
    3   Also allow better customization of keys  
    4    
    5    
    6   +++ Save cursor position between sessions  
    7   > 1. Would it be possible to make cursor position memory in wikiwords  
    8   > persistent after opening and closing the program?  
    9    
    10    
    11   +++ Remember page position (done: during session)  
    12   > 4. Similar to (3), when cursor positions are remembered, navigating  
    13   > back to a long page often means losing view of the cursor. It would be  
    14   > nice if exact page position were remembered.  
    15    
    16    
    17   +++ Blacklist camelcase words  
    18   Have a backlist page attribute type. On this page you could list camel case word that you do not want to become wikiwords.  
      1 > maybe you can introduce one more special att like "anchor:" or  
      2 > something like that where we want to keep record of certain line in a  
      3 > text? So whenever we click on that att it takes us to certain line of  
      4 > the text?  
    19 5  
    20 6  
    21   +++ About Inter-process comm.  
    22   Or if there'd be an option to maximize it \[already open instance] when I launch it 2nd time (I could create a hot-key to launch it). \[low prio.]  
      7 > (Having mentioned shortcut keys: is there any ways to change ctrl-space  
      8 > to e.g. alt-space for wikiword autocomplete?  
    23 9  
    24 10  
    …… 
    39 27  
    40 28 > Thanks. I'd suggest adding:  
    41   >  
      29 >   
    41 29 > Wikize Selected Word  
    42 30 > Add Text Block >  
    43 31 > Rename Wiki  
    44   >  
      32 >   
    44 32 > Export Current Wiki...?  
    45 33 *Details*:  
    …… 
    78 66 >> editor should be at the same position in the page where the preview was?  
    79 67 >> This would be nearly impossible.  
    80   >  
      68 >   
    80 68 > No, you've told me it was impossible. I just meant what you said (that  
    81 69 > you double-click anywhere in the Preview pane and it would switch to  
    …… 
    85 73  
    86 74  
    87   +++ Image resizing, attributes  
    88 75 <<  
    89 76 So I would suggest:  
    90   >  
      77 >   
    90 77 > http://www.blahblah.com/thisisimage.jpg>s*2  
    91   >  
      78 >   
    91 78 > http://www.blahblah.com/thisisimage.jpg>s/2  
    92   >  
      79 >   
    92 79 > http://www.blahblah.com/thisisimage.jpg>s250x150  
    93   >  
    94   >  
      80 >  
      81 >  
    95 82 > as syntax.  
    96   >  
    97   >  
      83 >  
      84 >  
    98 85 > The 's' is there to allow to add other commands later (prefixed with  
    99 86 > other letters).  
    …… 
    109 97 >>>>Have you an example link how the inclusion of one wiki page into  
    110 98 >>>Hmmm.. Well, in terms of wiki-code it might look like:  
    111   >>>[...]  
    112   >>>(AWikiword)  
      99 >>>[...]  
      100 >>>(AWikiword)  
    113 101 >>>[...]  
    114 102 >>  
    …… 
    116 104 >>normal text.  
    117 105 > Well, yes, it was only an example for demonstration :)  
    118   >  
      106 >   
    118 106 > Maybe [(WikiWord)], or((WikiWord)) ?  
    119 107 *Details*:  
    120 108 Syntax to use:  
    121   [:page: WikiWord]  
      109 \[:page: WikiWord]  
    121 109  
    122 110  
    123 111 +++ Dynamic creation of content sequences from e.g. searches  
    124   > 15. A way to lay out the contents of different wikiwords within  
    125   > another wikiword dynamically; in other words, a saved search or view  
    126   > which, instead of creating a list of pages, is itself an item that  
    127   > includes the contents of relevant pages in order within itself. This  
    128   > is something that tiddlywiki does to great effect (one can view more  
      112 > 15. A way to lay out the contents of different wikiwords within  
      113 > another wikiword dynamically; in other words, a saved search or view  
      114 > which, instead of creating a list of pages, is itself an item that  
      115 > includes the contents of relevant pages in order within itself. This  
      116 > is something that tiddlywiki does to great effect (one can view more  
    129 117 > than one item at once sequentially on a web page).  
    130 118  
    …… 
    134 122 +++ Dynamic creation of word lists/links from e.g. searches  
    135 123  
      124  
      125 > 1. Is there anyway to export wikis as XHTML files? It seems like the  
      126 > standard HTML export from wikidpad is pretty much consistent with  
      127 > the XHTML spec except that the <html> statement needs to specify a  
      128 > namespace (e.g. <html xmlns="http://www.w3.org/1999/xhtml">) and the  
      129 > <meta> and <link> statements are missing closing "/" characters. The  
      130 > reason I ask is that I want to be able to use MathML, but firefox  
      131 > only runs MathML in XHTML. Which leads me to my second question  
      132  
      133  
      134  
      135  
      136 This is one of the most important features for me. Perhaps it could be  
      137 implemented as a translation. Pasted HTML would be translated to  
      138 wikidPad equivalents. I currently use Zoot. I, and many others, are  
      139 looking for an alternative because Zoot does not handle HTML or images.  
      140 *Details*:  
      141 Also option to just import text and URL links from clipboard (also with clipboard catcher).  
      142  
      143  
    136 144 +++ Timer hook  
    137   > 4.It'll be very useful to have one more hook function, which is called  
    138   > every x minutes. It helped to implement some PIM functionality for  
      145 > 4.It'll be very useful to have one more hook function, which is called  
      146 > every x minutes. It helped to implement some PIM functionality for  
    139 147 > example.  
    140 148  
    141 149  
    142   +++ Toggle view tree on/off like main tree  
      150 Would it be possible to provide a hook to allow an wikidPad extension  
      151 to modify the "content" of a page before it is converted in  
      152 Exporters.exportContentToHtmlString to HTML?  
    143 153  
    144   +++ Remove lonely bullet on a line  
    145   > I assume you mean that on the last line which has only a bullet this  
    146   > > bullet should be removed when enter is pressed, otherwise you would  
    147   have  
    148   > > a line with a lonely bullet and nothing else.  
    149   > >  
    150   > >  
    151   > > So I would suggest the following behavior (the | denotes text cursor  
    152   > > position):  
    153   > >  
    154   > >     * The first  
    155   > >     * the second  
    156   > >     * |  
    157   > >  
    158   > >  
    159   > > after pressing enter, this would become  
    160   > >  
    161   > >     * The first  
    162   > >     * the second  
    163   > >     |  
    164 154  
      155 Especially in the editor. The large if/else construction in OnKeyDown is bad.  
      156 Also allow better customization of keys  
      157  
      158  
      159 Or if there'd be an option to maximize it \[already open instance] when I launch it 2nd time (I could create a hot-key to launch it). \[low prio.]  
      160  
      161  
    165 162  
    166 163  
    …… 
    170 174 > > > wikiword, shortest wikiword,  number of anything user defines or  
    171 175 > > > anything Michael thinks worth putting in maybe.  
    172   > > >  
      176 > > >   
    172 176 > > > I think that this can be per page attribute or global attribute that  
    173 177 > > > can be shown under "views".  
    174   > > >  
      178 > > >   
    174 178 > > > So if one puts [showstatistic!] in a page, there would be page under  
    175 179 > > > "views "  called "statistics" with the name of the page or global  
    176 180 > > > place. In that page one can check if there are repeats of the  
    177 181 > > > wikiwords etc to determine possible export problems?  
    178   > > >  
      182 > > >   
    178 182 > > > I also think that this can be a great helper for especially for  
    179 183 > > > writers who need to check their number of words etc.  
    180   >  
      184 >   
    180 184 > How about a third tab "Stats" after "Edit" and "Preview"? Clicking on it  
    181 185 > starts the calculation of per-page statistics and shows them if ready.  
    182   >  
      186 >   
    182 186 > As child of the "Views" tree node there could be an additional page for  
    183 187 > page-independent wiki-wide statistics.  
    …… 
    194 198  
    195 199 +++ Auto-complete closing bracket (as option)  
    196   > a) how come I have to insert the closing bracket ( ] ) whenever I  
      200 > a) how come I have to insert the closing bracket ( ] ) whenever I   
    196 200 > auto-insert any wikiword defined by brackets?  
    197 201  
    …… 
    214 218  
    215 219  
    216   +++ Select multiple tree nodes  
    217 220 > I see, thanks. I was trying under Views - parentless-nodes. I could use  
    218 221 > the same Ctrl/ShiftPress+click (is it called "sticky selection"?) in  
    …… 
    220 224  
    221 225  
    222   +++ Repair indentation in preview  
    223   Maybe use \<blockquote> in preview to show indented  
      226 > 3. WikidPad entries currently preserve line-breaks entered by the user,  
      227 > similar to the HTML <pre> element. This can be seen in the preview and  
      228 > the HTML export.  
      229 >  
      230 > Motivation: Wikis (and HTML) usually ignore line-breaks; you have to  
      231 > either use a <br> element or enter a blank line to achieve a  
      232 > line-break.  
      233 >  
      234 > Since existing WikidPad users probably expect the current line-break  
      235 > behaviour, you probably don't want to change this; however it would be  
      236 > great if WikidPad had a configuration option to store line-breaks  
      237 > normally but to ignore line-breaks when displaying them and in the HTML  
      238 > output.  
      239  
    224 240  
    225 241  
    …… 
    234 251 Sometimes it is very hard to keep tack of all special attributes and  
    235 252 their subgroups. It would be great to have auto completion for atts  
    236   too. That would keep things more ordered.  
      253 too. That would keep things more ordered.   
    236 253  
    237 254  
    …… 
    258 275  
    259 276  
      277 The way that I'm using it is to organize things by project, but to use  
      278 extensively the "View" at the bottom of the tree to group things by  
      279 using WikidPad's attributes (e.g. \[Current: Today]).  
      280  
      281 This way I can see at a glance all items with the same attributes.  
      282  
      283 My question is: is there a way to copy to easily print in the same page  
      284 (and/or copy to the clipboard) all the items with the same attribute?  
      285  
      286  
      287 I often tie WikiWords to todo items: \todo.personal: CallBank? Where CallBank? is a page with a bunch of information. The problem is that the CallBank? page does not appear as a subitem in the tree, and shows up as parentless in the views. It seems like that should get picked up by the system and handled like any other wiki page.  
      288  
      289  
      290  
      291    
    260 292 +++ System-wide hotkey  
    261 293 It would also be cool it WikiPad would support a hotkey to expand it.  
    …… 
    265 300  
    266 301  
      302 > Therefore it would be fine if we had an option to disable sync  
      303 > highlighting for large pages. What do you think about an option like:  
      304 > Disable sync highlighting for pages larger than X bytes. X is value  
      305 > definable by the user.  
      306 >  
      307 > 5. Attributes: In terms of the sync. highlighting it would be fine if  
      308 > it would be possible to turn highlighting on or off using these or  
      309 > similar attributes:  
      310 > \[global.highlighting: enabled]  
      311 > \[global.highlighting: disabled]  
      312 > \[highlighting: enabled]  
      313 > \[highlighting: disabled]  
      314  
      315  
    267 316 +++ On tree context menu click, don't switch to clicked tree item  
    268 317 > Having talked about nodes, when I right-click a node I wouldn't want to  
    …… 
    321 371  
    322 372  
      373 > As I'm for unclattered working spaces, what about a 'maximize working  
      374 > area' (or 'full screen view' if you like) kind of thing? (without menus,  
      375 > toolbar, tree, status bar etc. sounds like zen of wikidpad, doesn'it?)  
      376 *Details*:  
      377 Make configurable what should be seen in fs. mode  
      378  
      379  
    323 380 +++ Selective escaping blocks  
    324 381 One small request: on the block escaping is there is way to block  
    …… 
    333 391 +++ Handle pasting of images into WikidPad  
    334 392 >  My proposal is that Wikipad would save the pasted image to current  
    335   > project folder(where open wiki file is from)  under " images "  
      393 > project folder(where open wiki file is from)  under " images "   
    335 393 > folder. If there is not one wikipad would create it. And it creates a  
    336   > relative or actual link to the image.  
      394 > relative or actual link to the image.  
      395  
      396  
    337 397  
    338 398  
    …… 
    354 415 > themselves). I WILL GIVE YOU AN EXAMPLE WHAT I MEAN BELOW. PLS JUST SKIP  
    355 416 > THE NEXT FEW PARAGRAPHS IF NOT INTERESTED.  
    356   >  
      417 >   
    356 417 > You assume that I only want to create links on purpose, but what if I  
    357 418 > don't?  
    358   >  
      419 >   
    358 419 > Let me give you an example: I'm making lots of research for a project  
    359 420 > and collect notes in wikidPad, but I have something like 100 different  
    …… 
    369 430 > keeps the flow of writing completely fluent, and it was what I wanted to  
    370 431 > achieve in point 5 above with "GranDolina".)  
    371   >  
      432 >   
    371 432 > It has other handy uses, like learning languages: e.g. you paste a  
    372 433 > target-language text into a TextWiki. You start reading and come across  
    …… 
    377 438 > would see all the words that you have covered and click on them if  
    378 439 > you're not sure what they mean, etc.  
    379   >  
      440 >   
    379 440 >> and on the other hand you may create undesired links because a typed  
    380 441 >> text incidentially matches a wiki word.  
    381   >  
      442 >   
    381 442 > That's true, but if I'm so stupid to wikize a word like "the", than I  
    382 443 > deserve to have undesired links... It needs some common sense to wikize  
    383 444 > a bit more unique words/word combinations.  
    384   >  
      445 >   
    384 445 > Anyway, suppose I wikize something more unique and still create an  
    385 446 > undesired link; you could surely escape it... Also, I could still choose  
    …… 
    397 458  
    398 459  
      460 > I like using 3 separate wikis for my different projects, but sometimes I  
      461 > wish I could use them all together as one. What I see is a kind of  
      462 > 'merge wikis' thing, where I could open/access/modify/search all three  
      463 > of them as one, but I could open them separately as well, if I want.  
      464 > (What I see after 'merging', is a new wiki with the 3 separate wikis'  
      465 > names on the root page as tree nodes.) Do you know what I mean?  
      466  
      467  
    399 468 +++ Autocompletion for all words  
    400 469 > 2. Editor: SciTE offers auto completion. Right now Wikid Pad limits  
    …… 
    437 507 > > > pages the wikiword is italicized. This is necessary to differentiate  
    438 508 > > > from pages that have no SingleParent. The View Parents dialog  
    439   > > > similarly !s the father and italicizes the uncles.  
      509 > > > similarly !s the father and italicizes the uncles.   
    439 509  
    440 510  
    …… 
    444 514  
    445 515  
    446   +++ Special anchor: item (like todo items)  
    447   > maybe you can introduce one more special att like "anchor:" or  
    448   > something like that where we want to keep record of certain line in a  
    449   > text? So whenever we click on that att it takes us to certain line of  
    450   > the text?  
    451    
    452    
    453 516 +++ Customizable layout  
    454 517 Esp. horizontal split (tree over editor)  
    …… 
    464 527 >>Is there a way to export a View rather than a wiki tree?  The tree may  
    465 528 >>> > be a jumbled mess, but attributes put it all in a nice order, but then  
    466   >>> > there's no way to export that order.  
      529 >>> > there's no way to export that order.   
    466 529 >  
    467   >>  
      530 >>   
    467 530 >> Export the tree as what? A HTML or plain text file showing the tree  
    468 531 >> structure?  
    469   >>  
    470   >>  
      532 >>  
      533 >>  
    471 534 >> Michael  
    472 535 >>  
    …… 
    482 545 > > > least we may be able to get treeview exported? This way at least user  
    483 546 > > > will get information structure properly out of wikipad.  
    484   > > >  
      547 > > >   
    484 547 > > > I have 3 suggestions  
    485   > > >  
      548 > > >   
    485 548 > > > -can be indented text  
    486 549 > > > -can be hierarchy folder structure  
    487 550 > > > -can be firefox bookmark format  
    488   >  
      551 >   
    488 551 > First two are definitely possible.  
    489 552 > > > following on folder export style, for example if i have  
    490   > > >  
      553 > > >   
    490 553 > > > father  
    491 554 > > > --child1  
    492 555 > > > --child2  
    493 556 > > > ---grandson  
    494   > > >  
      557 > > >   
    494 557 > > > we can have a folder structure similar to above and those folders  
    495 558 > > > would have dummy .txt files named after the folder they belong.  
    496   > > > So, (extensionless words are folder names)  
    497   > > >  
      559 > > > So, (extensionless words are folder names)  
      560 > > >  
    498 561 > > > father  
    499 562 > > > --father.txt  
    …… 
    509 572 > > > ---grandson  
    510 573 > > > ----grandson.txt  
    511   > > >  
      574 > > >   
    511 574 > > > any ideas?  
    512 575  
    …… 
    538 601  
    539 602 +++ No more delayed respect of camelCaseWordsEnabled attribute  
    540   > (2) If I insert \[camelCaseWordsEnabled=false] in a page, in which  
    541   > camelcase words have been detected before, the links stay until I switch  
      603 > (2) If I insert \[camelCaseWordsEnabled=false] in a page, in which  
      604 > camelcase words have been detected before, the links stay until I switch  
    542 605 > to another page and switch back afterwards.  
    543 606  
    …… 
    547 610  
    548 611  
    549   +++ HTML import  
    550   This is one of the most important features for me. Perhaps it could be  
    551   implemented as a translation. Pasted HTML would be translated to  
    552   wikidPad equivalents. I currently use Zoot. I, and many others, are  
    553   looking for an alternative because Zoot does not handle HTML or images.  
    554 612  
    555 613  
    …… 
    571 629 For example  
    572 630  
    573   i have  
      631 i have   
    573 631 todo: please finish  
    574 632 and this is under lets say "dailies"  
    …… 
    578 636 "  todo and delete. But when i delete it it should not be deleting the  
    579 637 "dailies" page, it should just remove that "todo:please finish" from  
    580   the page it belongs (which is "dailies") .  
      638 the page it belongs (which is "dailies") .   
    580 638  
    581 639 In some cases todos may decribe a whole page , lets say  
    582   todo:true,  
      640 todo:true,   
    582 640 if that is the case then maybe we should be able to delete the whole page  
    583 641 >>  
    …… 
    590 648  
    591 649  
    592   +++ Popup attribute to show popups  
    593 650 Add an attribute called PopUp.  
    594 651 Its function would be if there is that attribute on a page,  
    …… 
    598 656 Example:  
    599 657 On the page RobertSmith I enter \[popup: 510-555-9898]  
    600   On any page where there is a link to [RobertSmith],  
      658 On any page where there is a link to [RobertSmith],   
    600 658 hovering on the link would show 510-555-9898  
    601 659 If the cursor/mouse is moved away the pop would disappear.  
    …… 
    607 665 there. It would be nice to have a right click tree menu item that is  
    608 666 "open url" .If there is any file and web url listed in the content  
    609   wikipad would launch the path when i select "open url" menu item.  
      667 wikipad would launch the path when i select "open url" menu item.   
    609 667  
    610 668 I understand that this can get very complicated and frustrating if one  
    …… 
    614 672 behave properly.  
    615 673  
    616   This will cut down steps of  
      674 This will cut down steps of   
    616 674  
    617 675 1 selecting the wikiword with url  
    …… 
    637 695  
    638 696 +++ Faster syntax highlighting  
    639   > I know that there's a thread that is supposed to work in background to  
      697 > I know that there's a thread that is supposed to work in background to   
    639 697 > create the format, but it's really slow for me.  
    640   >  
    641   > Maybe it's possible to compute format just before and after current  
      698 >  
      699 > Maybe it's possible to compute format just before and after current  
    642 700 > caret position, or maybe even just for the current visible page.  
    643 701  
    …… 
    660 718 > wikiwords open and they would each have a tab (where Edit and Preview  
    661 719 > tabs are) on top with their names.  
    662   >  
      720 >   
    662 720 > PLUS: It could be also integrated into the tree. Let's say you want to  
    663 721 > open all pages tagged [CurrentProject:true] you right click on the  
    …… 
    666 724 > 'CurrentProject'' in multiple tabs. By clever tagging you could open  
    667 725 > several pages in any combination you want.  
    668   >  
      726 >   
    668 726 > PLUS: You could also integrate this into the 'Open Wiki Word' (CTRL-O)  
    669 727 > window. If you name your wikiwords themed (I do that anyway) e.g.  
    …… 
    672 730 > type 'Spain' in the field, you could open all wikiwords themed 'Spain'.  
    673 731 > Also, the same could be integrated into Search Wiki (CTRL-ALT-F).  
    674   >  
      732 >   
    674 732 > PLUS: HoldDownCtrl+Click would also come in handy here. E.g. you pick  
    675 733 > several wikiwords in the tree (or in the 'Open Wiki Word' window or in  
    …… 
    678 736 > HoldDownCtrl+Click would also be handy to delete several wikis (once you  
    679 737 > mentioned deleting several wikis under 'parentless-nodes', but I don't  
    680   > seem to find any function like that. Or is it ‘Vacuum Wiki’?)  
      738 > seem to find any function like that. Or is it ‘Vacuum Wiki’?)  
    680 738  
    681 739  
    …… 
    684 742  
    685 743 +++ Parentless words as family wiki-words  
    686   > Then a bug report: if a wikiword (e.g.: AaA) is the child of a parent-less  
    687   > wikiword (e.g.:BbB), AaA doesn't show up in the tree view. I expected to see  
      744 > Then a bug report: if a wikiword (e.g.: AaA) is the child of a parent-less  
      745 > wikiword (e.g.:BbB), AaA doesn't show up in the tree view. I expected to see  
    688 746 > AaA as the child of BbB, with BbB showed under the parent-less-nodes node.  
    689 747  
    …… 
    710 768 +++ Configurable delimiters to enclose wiki words instead of brackets  
    711 769 Using the same delimiters for wikiwords and properties makes sense to  
    712   me. More consistent, and doesn't require having to think about it.  
      770 me. More consistent, and doesn't require having to think about it.   
    712 770  
    713 771  
    …… 
    718 776  
    719 777  
    720   +++ Options to switch off highlighting  
    721   > Therefore it would be fine if we had an option to disable sync  
    722   > highlighting for large pages. What do you think about an option like:  
    723   > Disable sync highlighting for pages larger than X bytes. X is value  
    724   > definable by the user.  
    725   >  
    726   > 5. Attributes: In terms of the sync. highlighting it would be fine if  
    727   > it would be possible to turn highlighting on or off using these or  
    728   > similar attributes:  
    729   > [global.highlighting: enabled]  
    730   > [global.highlighting: disabled]  
    731   > [highlighting: enabled]  
    732   > [highlighting: disabled]  
    733    
    734    
    735 778 +++ Property to set default pane  
    736 779 > 6. Attributes: Pages can be viewed either in the editor pane or in the  
    …… 
    761 804  
    762 805 +++ Random word at startup  
    763   > Michael--Thanks for incorporating the "First word at startup" option  
    764   > in the latest release. As an extension (or antithesis) of that  
    765   > feature, might it also be possible to have an option to start on a  
    766   > random page? This would be amusing and useful in the sense of  
      806 > Michael--Thanks for incorporating the "First word at startup" option  
      807 > in the latest release. As an extension (or antithesis) of that  
      808 > feature, might it also be possible to have an option to start on a  
      809 > random page? This would be amusing and useful in the sense of  
    767 810 > reminding us of the existence of long-forgotten pages.  
      811  

  • branches/mbutscher/work/WikidPadStarter.py

    r88 r90  
    4 4 os.stat_float_times(True)  
    5 5  
    6   VERSION_STRING = "wikidPad 1.8beta1"  
      6 VERSION_STRING = "wikidPad 1.8beta2"  
    6 6  
    7 7 if not hasattr(sys, 'frozen'):  

  • branches/mbutscher/work/extensions/WikiSyntax.py

    r89 r90  
    33 33         re.DOTALL | re.UNICODE | re.MULTILINE)  
    34 34 HtmlTagRE = re.compile(  
    35           ur"</?[A-Za-z][A-Za-z0-9]*(?:/| [^\n]*)?>",  
      35         ur"</?[A-Za-z][A-Za-z0-9]*(?:/| [^\n>]*)?>",  
    35 35         re.DOTALL | re.UNICODE | re.MULTILINE)  
    36 36 Heading4RE      = re.compile(u"^\\+\\+\\+\\+(?!\\+) ?(?P<h4Content>" +  
    …… 
    161 161  
    162 162  
      163 InsertionRE     = re.compile(ur"\[:[ \t]*(?P<insertionKey>[\w\-\_\.]+?)[ \t]*" +  
      164                   ur"[:][ \t]*(?P<insertionValue>[\w\-\_ \t;,.!?#/|]+?)\]",  
      165                   re.DOTALL | re.UNICODE | re.MULTILINE)  
      166  
    163 167 # Reverse REs for autocompletion  
    164 168 revSingleWikiWord    =       (ur"(?:[" +  

  • branches/mbutscher/work/lib/pwiki/WikiTxtCtrl.py

    r89 r90  
    664 664         textlen = len(text)  
    665 665  
    666   #         self.tokenizer.setTokenThread(None)  
    667    
    668 666         t = self.stylingThreadHolder.getThread()  
    669 667         if t is not None:  
    670   #             t.cancel()  
    671 668             self.stylingThreadHolder.setThread(None)  
    672 669             self.stylebytes = None  
    …… 
    690 687                     "main", "async_highlight_delay")  
    691 688             t = threading.Thread(None, self.buildStyling, args = (text, delay, sth))  
    692   #             t = threading.Timer(1, self.buildStyling, args = (text, sth))  
    693 689             sth.setThread(t)  
    694 690             t.start()  
    …… 
    782 778                 else:  
    783 779                     styleno = WikiFormatting.FormatTypes.WikiWord  
    784            
      780  
      781             elif styleno == WikiFormatting.FormatTypes.Insertion:  
      782                 styleno = WikiFormatting.FormatTypes.Script  
    785 783             elif styleno == WikiFormatting.FormatTypes.ToDo:  
    786 784                 styleno = -1  

  • branches/mbutscher/work/lib/pwiki/Exporters.py

    r89 r90  
    58 58  
    59 59  
      60 class LinkCreatorForHtmlMultiPageExport:  
      61     """  
      62     Faked link dictionary for HTML exporter  
      63     """  
      64     def __init__(self, wikiData, htmlXmlExporter):  
      65         self.wikiData = wikiData  
      66         self.htmlXmlExporter = htmlXmlExporter  
      67          
      68     def get(self, word, default = None):  
      69         if not self.wikiData.isDefinedWikiWord(word):  
      70             return default  
      71