From 8709ffefb8ca4ace4cda83e3d6f5ecb60d4ef079 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 2 Apr 2016 15:20:40 +0200
Subject: [PATCH] Fixed a non-functioning MXP call using the |-style format.

---
 evennia/server/portal/mxp.py | 2 ++
 evennia/utils/ansi.py        | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/server/portal/mxp.py b/evennia/server/portal/mxp.py
index 7fd3fe1b5b..02e80a7a90 100644
--- a/evennia/server/portal/mxp.py
+++ b/evennia/server/portal/mxp.py
@@ -17,6 +17,7 @@ from builtins import object
 import re
 
 LINKS_SUB =  re.compile(r'\{lc(.*?)\{lt(.*?)\{le', re.DOTALL)
+LINKS_SUB2 = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL)
 
 MXP = "\x5B"
 MXP_TEMPSECURE = "\x1B[4z"
@@ -42,6 +43,7 @@ def mxp_parse(text):
                .replace(">", "&gt;")
 
     text = LINKS_SUB.sub(MXP_SEND, text)
+    text = LINKS_SUB2.sub(MXP_SEND, text)
     return text
 
 class Mxp(object):
diff --git a/evennia/utils/ansi.py b/evennia/utils/ansi.py
index 11c0539d03..04847ff7ef 100644
--- a/evennia/utils/ansi.py
+++ b/evennia/utils/ansi.py
@@ -138,7 +138,6 @@ class ANSIParser(object):
         if use_xterm256:
             colval = 16 + (red * 36) + (green * 6) + blue
             return "\033[%s8;5;%s%s%sm" % (3 + int(background), colval // 100, (colval % 100) // 10, colval%10)
-            #return "\033[%s8;5;%sm" % (3 + int(background), colval)
         else:
             # xterm256 not supported, convert the rgb value to ansi instead
             if red == green == blue and red < 3:
@@ -436,7 +435,7 @@ class ANSIParser(object):
         ]
 
     mxp_re = r'\{lc(.*?)\{lt(.*?)\{le|' \
-           + r'\|lc(.*?)\|lt(.*?)\|le'
+             r'\|lc(.*?)\|lt(.*?)\|le'
 
     # prepare regex matching
     brightbg_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in ansi_bright_bgs]), re.DOTALL)