Index: trac/wiki/formatter.py
===================================================================
--- trac/wiki/formatter.py	(revision 4417)
+++ trac/wiki/formatter.py	(working copy)
@@ -152,7 +152,9 @@
 
     BOLDITALIC_TOKEN = "'''''"
     BOLD_TOKEN = "'''"
+    BOLD_TOKEN_WC = r"\*\*"
     ITALIC_TOKEN = "''"
+    ITALIC_TOKEN_WC = "//"
     UNDERLINE_TOKEN = "__"
     STRIKE_TOKEN = "~~"
     SUBSCRIPT_TOKEN = ",,"
@@ -182,7 +184,9 @@
         # Font styles
         r"(?P<bolditalic>!?%s)" % BOLDITALIC_TOKEN,
         r"(?P<bold>!?%s)" % BOLD_TOKEN,
+        r"(?P<bold_wc>!?%s)" % BOLD_TOKEN_WC,
         r"(?P<italic>!?%s)" % ITALIC_TOKEN,
+        r"(?P<italic_wc>!?%s)" % ITALIC_TOKEN_WC,
         r"(?P<underline>!?%s)" % UNDERLINE_TOKEN,
         r"(?P<strike>!?%s)" % STRIKE_TOKEN,
         r"(?P<subscript>!?%s)" % SUBSCRIPT_TOKEN,
@@ -199,19 +203,19 @@
         r"(?P<citation>^(?P<cdepth>>(?: *>)*))",
         # &, < and > to &amp;, &lt; and &gt;
         r"(?P<htmlescape>[&<>])",
+        # [[macro]] call
+        (r"(?P<macro>!?\[\[(?P<macroname>[\w/+-]+)"
+         r"(\]\]|\((?P<macroargs>.*?)\)\]\]))"),
         # wiki:TracLinks
         r"(?P<shref>!?((?P<sns>%s):(?P<stgt>%s|%s(?:%s*%s)?)))" \
         % (LINK_SCHEME, QUOTED_STRING,
            SHREF_TARGET_FIRST, SHREF_TARGET_MIDDLE, SHREF_TARGET_LAST),
         # [wiki:TracLinks with optional label] or [/relative label]
-        (r"(?P<lhref>!?\[(?:"
+        (r"(?P<lhref>!?\[\[?(?:"
          r"(?P<rel>%s)|" % LHREF_RELATIVE_TARGET + # ./... or /...
-         r"(?P<lns>%s):(?P<ltgt>%s|[^\]\s]*))" % \
+         r"(?P<lns>%s):(?P<ltgt>%s|[^\]\s\|]*))" % \
          (LINK_SCHEME, QUOTED_STRING) + # wiki:TracLinks or wiki:"trac links"
-         r"(?:\s+(?P<label>%s|[^\]]+))?\])" % QUOTED_STRING), # optional label
-        # [[macro]] call
-        (r"(?P<macro>!?\[\[(?P<macroname>[\w/+-]+)"
-         r"(\]\]|\((?P<macroargs>.*?)\)\]\]))"),
+         r"(?:(?:\s+|\|)(?P<label>%s|[^\]]+))?\]\]?)" % QUOTED_STRING), # label
         # == heading == #hanchor
         r"(?P<heading>^\s*(?P<hdepth>=+)\s.*\s(?P=hdepth)\s*"
         r"(?P<hanchor>#%s)?$)" % XML_NAME,
@@ -302,10 +306,18 @@
 
     def _bold_formatter(self, match, fullmatch):
         return self.simple_tag_handler(match, '<strong>', '</strong>')
+    # should be <b>
 
+    def _bold_wc_formatter(self, match, fullmatch):
+        return self.simple_tag_handler(match, '<b>', '</b>')
+    # should be <strong>
+
     def _italic_formatter(self, match, fullmatch):
         return self.simple_tag_handler(match, '<i>', '</i>')
 
+    def _italic_wc_formatter(self, match, fullmatch):
+        return self.simple_tag_handler(match, '<em>', '</em>')
+
     def _underline_formatter(self, match, fullmatch):
         return self.simple_tag_handler(match, '<span class="underline">',
                                        '</span>')