Support for cross-references

This commit is contained in:
benweet 2013-04-21 23:28:46 +01:00
parent c50e53f193
commit 5d6f2679e7
7 changed files with 41 additions and 17 deletions

View File

@ -1 +1 @@
CACHE MANIFEST # v4 CACHE: index.html css/main-min.css js/main-min.js js/require.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: *
CACHE MANIFEST # v5 CACHE: index.html css/main-min.css js/main-min.js js/require.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: *

19
css/main-min.css vendored
View File

@ -5442,10 +5442,7 @@ code {
color: #333333 !important;
}
h1 {
margin: 40px 0 20px;
}
h2 {
margin-top: 30px;
margin: 30px 0 30px;
}
p, pre, blockquote {
margin: 0 0 20px;
@ -5646,3 +5643,17 @@ table thead:first-child tr:first-child td {
table tbody + tbody {
border-top: 2px solid #dddddd;
}
blockquote p {
margin-bottom: 0;
font-size: 17.5px;
font-weight: 300;
line-height: 1.25;
}
ul, ol {
margin-bottom: 20px;
}
blockquote p {
margin-bottom: 20px;
font-size: 14px;
line-height: 20px;
}

View File

@ -121,11 +121,7 @@ code {
}
h1 {
margin: 40px 0 20px;
}
h2 {
margin-top: 30px;
margin: 30px 0 30px;
}
p, pre, blockquote {
@ -372,3 +368,20 @@ table thead:first-child tr:first-child td {
table tbody + tbody {
border-top: 2px solid #dddddd;
}
blockquote p {
margin-bottom: 0;
font-size: 17.5px;
font-weight: 300;
line-height: 1.25;
}
ul, ol {
margin-bottom: 20px;
}
blockquote p {
margin-bottom: 20px;
font-size: 14px;
line-height: 20px;
}

View File

@ -204,14 +204,14 @@ else
text = _UnescapeSpecialChars(text);
text = pluginHooks.postConversion(text);
// attacklab: Restore dollar signs
text = text.replace(/~D/g, "$$");
// attacklab: Restore tildes
text = text.replace(/~T/g, "~");
text = pluginHooks.postConversion(text);
g_html_blocks = g_titles = g_urls = null;
return text;

View File

@ -262,8 +262,8 @@
// TODO: use sentinels. Should we just add/remove them in doConversion?
// TODO: better matches for id / class attributes
var attrBlock = "\\{\\s*[.|#][^}]+\\}";
var hdrAttributesA = new RegExp("^(#{1,6}.*\\s*#{0,6})\\s+(" + attrBlock + ")\\s*(\\n|0x03)", "gm");
var hdrAttributesB = new RegExp("^(.*\\s.*)\\s+(" + attrBlock + ")\\s*\\n" +
var hdrAttributesA = new RegExp("^(#{1,6}.*#{0,6})\\s+(" + attrBlock + ")\\s*(\\n|0x03)", "gm");
var hdrAttributesB = new RegExp("^(.*)\\s+(" + attrBlock + ")\\s*\\n" +
"(?=[\\-|=]+\\s*(\\n|0x03))", "gm"); // underline lookahead
var fcbAttributes = new RegExp("^(```[^{]*)\\s+(" + attrBlock + ")\\s*\\n" +
"(?=([\\s\\S]*?)\\n```\\s*(\\n|0x03))", "gm");
@ -280,7 +280,7 @@
Markdown.Extra.prototype.applyAttributeBlocks = function(text) {
var self = this;
var blockRe = new RegExp('<p>~XX(\\d+)XX</p>[\\s\\S]*' +
var blockRe = new RegExp('<p>~XX(\\d+)XX</p>[\\s]*' +
'(?:<(h[1-6]|pre)(?: +class="(\\S+)")?(>[\\s\\S]*</\\2>))', "gm");
text = text.replace(blockRe, function(wholeMatch, k, tag, cls, rest) {
if (!tag) // no following header or fenced code block.

View File

@ -22,7 +22,7 @@
// (tags that can be opened/closed) | (tags that stand alone)
var basic_tag_whitelist = /^(<\/?(b|blockquote|code|del|dd|dl|dt|em|h1|h2|h3|i|kbd|li|ol|p|pre|s|sup|sub|strong|strike|ul)>|<(br|hr)\s?\/?>)$/i;
// <a href="url..." optional title>|</a>
var a_white = /^(<a\shref="((https?|ftp):\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+"(\stitle="[^"<>]+")?\s?>|<\/a>)$/i;
var a_white = /^(<a\shref="(((https?|ftp):\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+|#[-A-Za-z0-9_:.]+)"(\stitle="[^"<>]+")?\s?>|<\/a>)$/i;
// <img src="url..." optional width optional height optional alt optional title
var img_white = /^(<img\ssrc="(https?:\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+"(\swidth="\d{1,3}")?(\sheight="\d{1,3}")?(\salt="[^"<>]*")?(\stitle="[^"<>]*")?\s?\/?>)$/i;

2
js/main-min.js vendored

File diff suppressed because one or more lines are too long