# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1359763779 -3600
# Node ID 89611d9f33b1dcb3e886a36a933ebd6e9a69538c
# Parent  c91e6fd46631a3ba85d7baf391a6e01445bea23f
Added a patch for plain text link formatting for Moin 1.8.
Tidied up the troubleshooting section, adding a note about the plain text
formatting patch.
Updated the "to do" list.

diff -r c91e6fd46631 -r 89611d9f33b1 README.txt
--- a/README.txt	Sat Feb 02 00:47:24 2013 +0100
+++ b/README.txt	Sat Feb 02 01:09:39 2013 +0100
@@ -261,8 +261,8 @@
 
 https://hg.boddie.org.uk/vContent
 
-Troubleshooting
----------------
+Troubleshooting: Categories
+---------------------------
 
 See here for a bug related to category recognition:
 
@@ -271,6 +271,9 @@
 This affects installations where migrations between versions have occurred,
 yet the Wiki configuration retains old regular expression details.
 
+Troubleshooting: Xapian
+-----------------------
+
 Xapian can be troublesome, especially where file permissions are concerned: if
 something acquires a lock on the index (for example, the moin script, possibly
 invoked via moinsetup) nothing else will be able to modify the index, and this
@@ -285,6 +288,21 @@
 
 find path-to-wiki/data/cache/xapian -depth -name "*-lock" -type d -exec rmdir '{}' \;
 
+Troubleshooting: Plain Text Formatting
+--------------------------------------
+
+Plain text formatting is used in certain places in EventAggregator, but the
+formatter is rather broken in MoinMoin 1.8 and in previous releases. See the
+following page for a summary:
+
+http://moinmo.in/FeatureRequests/TextPlainFormatterRewrite
+
+A patch is supplied in the patches directory to fix link formatting in the
+plain text formatter, and once copied into the root directory of the MoinMoin
+1.8 sources it can be applied as follows:
+
+patch -p1 < patch-plain-text-link-formatting-1.8.diff
+
 Contact, Copyright and Licence Information
 ------------------------------------------
 
diff -r c91e6fd46631 -r 89611d9f33b1 TO_DO.txt
--- a/TO_DO.txt	Sat Feb 02 00:47:24 2013 +0100
+++ b/TO_DO.txt	Sat Feb 02 01:09:39 2013 +0100
@@ -117,15 +117,6 @@
 for authors to include a UID property identifying each event, using the same
 value regardless of where the event is being published.
 
-Formatting in HTML Output
--------------------------
-
-Locations are sometimes expressed using more advanced formatting than plain
-text, leading to Wiki notation being shown as plain text in, for example, the
-day view or in pop-up elements. Such information should be formatted
-appropriately. This may mean rendering location links to text before putting
-them in the location pop-up headings used by the map view.
-
 Formatting in iCalendar Output
 ------------------------------
 
diff -r c91e6fd46631 -r 89611d9f33b1 patches/patch-plain-text-link-formatting-1.8.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/patch-plain-text-link-formatting-1.8.diff	Sat Feb 02 01:09:39 2013 +0100
@@ -0,0 +1,52 @@
+# HG changeset patch
+# User Paul Boddie <paul@boddie.org.uk>
+# Date 1359762149 -3600
+# Node ID f192339c4473f140b07a1522ecac636abe616350
+# Parent  f548add9c9d5a0c445c752c82fb6465c2b442d21
+Fixed the plain text formatting of links.
+
+diff -r f548add9c9d5 -r f192339c4473 MoinMoin/formatter/text_plain.py
+--- a/MoinMoin/formatter/text_plain.py	Fri Feb 01 01:38:47 2013 +0100
++++ b/MoinMoin/formatter/text_plain.py	Sat Feb 02 00:42:29 2013 +0100
+@@ -45,14 +45,14 @@
+             self._text = []
+             return u''
+         else:
+-            if "".join(self._text) == self._url:
++            try:
++                if "".join(self._text) == self._url:
++                    return ''
++                else:
++                    return u' [%s]' % self._url
++            finally:
+                 self._url = None
+                 self._text = None
+-                return ''
+-            else:
+-                self._url = None
+-                self._text = None
+-                return u' [%s]' % (self._url)
+ 
+     def url(self, on, url='', css=None, **kw):
+         if on:
+@@ -60,14 +60,14 @@
+             self._text = []
+             return u''
+         else:
+-            if "".join(self._text) == self._url:
++            try:
++                if "".join(self._text) == self._url:
++                    return ''
++                else:
++                    return u' [%s]' % self._url
++            finally:
+                 self._url = None
+                 self._text = None
+-                return ''
+-            else:
+-                self._url = None
+-                self._text = None
+-                return u' [%s]' % (self._url)
+ 
+     def attachment_link(self, on, url=None, **kw):
+         if on: