StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

fix(tables): pipe char can now be escaped

Browse Source 
Pipe character is now treated as a special markdown char,
which makes it possible to escape it.

Closes #345
This commit is contained in:
Estevao Soares dos Santos 2017-02-21 14:13:12 +00:00
parent 5d40c7a0ee
commit 1ebc1959dd
11 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/showdown.js vendored
View File

Binary file not shown.

BIN
dist/showdown.js.map vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js.map vendored
View File

Binary file not shown.

2
src/subParsers/encodeBackslashEscapes.js
View File

@ -14,7 +14,7 @@ showdown.subParser('encodeBackslashEscapes', function (text, options, globals) {
text = globals.converter._dispatch('encodeBackslashEscapes.before', text, options, globals);
text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
text = text.replace(/\\([`*_{}\[\]()>#+.!~=-])/g, showdown.helper.escapeCharactersCallback);
text = text.replace(/\\([`*_{}\[\]()>#+.!~=|-])/g, showdown.helper.escapeCharactersCallback);
text = globals.converter._dispatch('encodeBackslashEscapes.after', text, options, globals);
return text;

2
src/subParsers/escapeSpecialCharsWithinTagAttributes.js
View File

@ -13,7 +13,7 @@ showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text, opti
text = text.replace(regex, function (wholeMatch) {
return wholeMatch
.replace(/(.)<\/?code>(?=.)/g, '$1`')
.replace(/([\\`*_~=])/g, showdown.helper.escapeCharactersCallback);
.replace(/([\\`*_~=|])/g, showdown.helper.escapeCharactersCallback);
});
text = globals.converter._dispatch('escapeSpecialCharsWithinTagAttributes.after', text, options, globals);

4
src/subParsers/tables.js
View File

@ -57,6 +57,10 @@ showdown.subParser('tables', function (text, options, globals) {
text = globals.converter._dispatch('tables.before', text, options, globals);
// find escaped pipe characters
text = text.replace(/\\(\|)/g, showdown.helper.escapeCharactersCallback);
// parse tables
text = text.replace(tableRgx, function (rawTable) {
var i, tableLines = rawTable.split('\n');

30
test/features/tables/#345.escape-pipe-character.html Normal file
View File

@ -0,0 +1,30 @@
<table>
<thead>
<tr>
<th>Operator</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>&amp;</td>
<td>Logical AND</td>
</tr>
<tr>
<td>&amp;&amp;</td>
<td>Shortcut AND</td>
</tr>
<tr>
<td>|</td>
<td>Logical OR</td>
</tr>
<tr>
<td>||</td>
<td>Shortcut OR</td>
</tr>
<tr>
<td>^</td>
<td>Logical XOR</td>
</tr>
</tbody>
</table>

7
test/features/tables/#345.escape-pipe-character.md Normal file
View File

@ -0,0 +1,7 @@
| Operator | Description |
|----------|-------------|
| & | Logical AND |
| && | Shortcut AND |
| \| | Logical OR |
| \|\| | Shortcut OR |
| ^ | Logical XOR |

1
test/issues/#345.no-escape-for-the-pipe-character.html Normal file
View File

@ -0,0 +1 @@
<p>this |</p>

1
test/issues/#345.no-escape-for-the-pipe-character.md Normal file
View File

@ -0,0 +1 @@
this \|