|
@@ -81,7 +81,7 @@ public class Styliser implements ConfigChangeListener {
|
81
|
81
|
/** Regexp to match characters which shouldn't be used in channel links. */
|
82
|
82
|
private static final String RESERVED_CHARS = "[^\\s" + CODE_BOLD + CODE_COLOUR
|
83
|
83
|
+ CODE_STOP + CODE_HEXCOLOUR + CODE_FIXED + CODE_ITALIC
|
84
|
|
- + CODE_UNDERLINE + CODE_CHANNEL + CODE_NICKNAME + CODE_NEGATE + "\"]";
|
|
84
|
+ + CODE_UNDERLINE + CODE_CHANNEL + CODE_NICKNAME + CODE_NEGATE + "\",]";
|
85
|
85
|
|
86
|
86
|
/** Defines all characters treated as trailing punctuation that are illegal in URLs. */
|
87
|
87
|
private static final String URL_PUNCT_ILLEGAL = "\"";
|
|
@@ -125,7 +125,7 @@ public class Styliser implements ConfigChangeListener {
|
125
|
125
|
+ HYPERLINK_CHARS + "]+?)([" + URL_PUNCT + "]?)([" + HYPERLINK_CHARS + "])";
|
126
|
126
|
|
127
|
127
|
/** The regular expression to use for marking up channels. */
|
128
|
|
- private static final String URL_CHANNEL = "(?i)(?<![^\\s\\+@\\-<>\\(\"'])([\\Q%s\\E]"
|
|
128
|
+ private static final String URL_CHANNEL = "(?i)(?<![^\\s\\+@\\-<>\\(\"',])([\\Q%s\\E]"
|
129
|
129
|
+ RESERVED_CHARS + "+)";
|
130
|
130
|
|
131
|
131
|
/** Whether or not we should style links. */
|