Changeset 718

Timestamp:

09/15/06 15:23:06 (2 years ago)

Author:

JeremyRuston

Message:

Fix for problem of new --strikethrough-- formatting clashing with "fake emdash" (--) (ticket #169)

Files:

• Branches/2.1/core/js/Formatter.js (modified) (2 diffs)

Branches/2.1/core/js/Formatter.js

@@ -493 +493 @@
 {
         name: "strikeByChar",
-        match: "--",
-        termRegExp: /(--)/mg,
+        match: "--(?!\\s|$)",
+        termRegExp: /((?!\s)--|(?=\n\n))/mg,
         element: "strike",
         handler: config.formatterHelpers.createElementAndWikify
@@ -557 +557 @@
 
 {
+        name: "mdash",
+        match: "--",
+        handler: function(w)
+                {
+                createTiddlyElement(w.output,"span").innerHTML = "&mdash";
+                }
+},
+
+{
         name: "htmlEntitiesEncoding",
         match: "(?:(?:&#?[a-zA-Z0-9]{2,8};|.)(?:&#?(?:x0*(?:3[0-6][0-9a-fA-F]|1D[c-fC-F][0-9a-fA-F]|20[d-fD-F][0-9a-fA-F]|FE2[0-9a-fA-F])|0*(?:76[89]|7[7-9][0-9]|8[0-7][0-9]|761[6-9]|76[2-7][0-9]|84[0-3][0-9]|844[0-7]|6505[6-9]|6506[0-9]|6507[0-1]));)+|&#?[a-zA-Z0-9]{2,8};)",