[merge fixes from main Panu Kalliokoski **20050226215538 Keywords: Patches applied: * admin@ling.helsinki.fi--2004/piki--ling--1--patch-4 hrule markup must be anchored at beginning of line * admin@ling.helsinki.fi--2004/piki--ling--1--patch-5 no emphases in pre * admin@ling.helsinki.fi--2004/piki--ling--1--patch-6 fix is_pre --> in_pre * atehwa@sange.fi--2004/piki--prod--1--patch-29 no hellip entity (not defined) * atehwa@sange.fi--2004/piki--prod--1--patch-30 merge formatting changes from ling * atehwa@sange.fi--2004/piki--prod--1--patch-31 politically correct constraints * atehwa@sange.fi--2004/piki--prod--1--version-0 moved to atehwa@sange.fi--2005 * atehwa@sange.fi--2005/piki--prod--1--base-0 tag of atehwa@sange.fi--2004/piki--prod--1--patch-31 * pkalliok@ling.helsinki.fi--2004-maim/piki--prod--1--patch-9 merge from main * pkalliok@ling.helsinki.fi--2004-maim/piki--prod--1--patch-10 merge from 2005 * pkalliok@ling.helsinki.fi--2004-maim/piki--prod--1--patch-11 editor-pre ja editor-post (atehwa@sange.fi--2005/piki--intl--1--patch-1) ] { hunk ./piki.py 217 - print """Talletettu %s + print """Saved %s hunk ./piki.py 312 + hunk ./piki.py 411 + if self.in_pre: return word hunk ./piki.py 420 + if self.in_pre: return word hunk ./piki.py 429 + if self.in_pre: return word hunk ./piki.py 478 + if self.in_pre: return word hunk ./piki.py 483 + if self.in_pre: return word hunk ./piki.py 486 - hunk ./piki.py 502 - + r"|(?P-{4,})" + + r"|(?P^-{4,}$)" hunk ./piki.py 522 + +def print_formatted(pagename): + PageFormatter(Page(pagename).get_raw_body()).print_html() + hunk ./piki.py 569 - if len(diff) > 25: res = res + '…' + if len(diff) > 25: res = res + '...' hunk ./piki.py 580 - PageFormatter(Page('menu').get_raw_body()).print_html() + print_formatted('menu') hunk ./piki.py 602 + print_formatted('editor-pre') hunk ./piki.py 613 - print Page('EditingTips').link_to() + print_formatted('editor-post') }