Skip to content

Commit 939a340

Browse files
morgan3dmorgan3d
committed
archive
1 parent 16f3fe9 commit 939a340

File tree

6 files changed

+50
-32
lines changed

6 files changed

+50
-32
lines changed

‎1.17/markdeep.js

+18-14
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ function insertTableOfContents(s, protect, exposer) {
23912391
// Gather headers for table of contents (TOC). We
23922392
// accumulate a long and short TOC and then choose which
23932393
// to insert at the end.
2394-
var fullTOC = '<a href="#" class="tocTop">(Top)</a><br/>\n';
2394+
var fullTOC = '<a href="#" class="tocTop" target="_self">(Top)</a><br/>\n';
23952395
var shortTOC = '';
23962396

23972397
// names of parent sections
@@ -2443,10 +2443,10 @@ function insertTableOfContents(s, protect, exposer) {
24432443
// Only insert for the first three levels
24442444
if (level <= tocDepth) {
24452445
// Indent and append (the Array() call generates spaces)
2446-
fullTOC += Array(level).join('&nbsp;&nbsp;') + '<a href="#' + name + '" class="level' + level + '"><span class="tocNumber">' + number + '&nbsp; </span>' + text + '</a><br/>\n';
2446+
fullTOC += Array(level).join('&nbsp;&nbsp;') + '<a href="#' + name + '" target="_self" class="level' + level + '"><span class="tocNumber">' + number + '&nbsp; </span>' + text + '</a><br/>\n';
24472447

24482448
if (level === 1) {
2449-
shortTOC += ' &middot; <a href="#' + name + '">' + text + '</a>';
2449+
shortTOC += ' &middot; <a href="#' + name + '" target="_self">' + text + '</a>';
24502450
} else {
24512451
++numAboveLevel1;
24522452
}
@@ -2939,7 +2939,7 @@ function markdeepToHTML(str, elementMode) {
29392939
endNoteTable[symbolicName] = endNoteCount;
29402940
}
29412941

2942-
return '<sup><a ' + protect('href="#endnote-' + symbolicName + '"') +
2942+
return '<sup><a ' + protect('href="#endnote-' + symbolicName + '" target="_self"') +
29432943
'>' + endNoteTable[symbolicName] + '</a></sup>';
29442944
}
29452945
str = str.rp(/[ \t]*\[\^([^\]\n\t ]+)\](?!:)/g, endNote);
@@ -2963,7 +2963,7 @@ function markdeepToHTML(str, elementMode) {
29632963
for (var i = 0; i < symbolicNameList.length; ++i) {
29642964
// Strip spaces and # signs
29652965
var name = symbolicNameList[i].rp(/#| /g, '');
2966-
s += entag('a', name, protect('href="#citation-' + name.toLowerCase() + '"'));
2966+
s += entag('a', name, protect('href="#citation-' + name.toLowerCase() + '" target="_self"'));
29672967
if (i < symbolicNameList.length - 1) { s += ', '; }
29682968
}
29692969
return s + ']';
@@ -3346,7 +3346,7 @@ function markdeepToHTML(str, elementMode) {
33463346
if (allHeaders) {
33473347
allHeaders.forEach(function (header) {
33483348
header = removeHTMLTags(header.ss(4, header.length - 5)).trim();
3349-
var link = '<a ' + protect('href="#' + mangle(header) + '"') + '>';
3349+
var link = '<a ' + protect('href="#' + mangle(header) + '" target="_self"') + '>';
33503350

33513351
var sectionExp = '(' + keyword('section') + '|' + keyword('subsection') + '|' + keyword('chapter') + ')';
33523352
var headerExp = '(\\b' + escapeRegExpCharacters(header) + ')';
@@ -3373,7 +3373,7 @@ function markdeepToHTML(str, elementMode) {
33733373

33743374
if (t) {
33753375
t.used = true;
3376-
return '<a ' + protect('href="#' + ref + '"') + '>' + _type + '&nbsp;' + t.number + maybeShowLabel(_ref) + '</a>';
3376+
return '<a ' + protect('href="#' + ref + '" target="_self"') + '>' + _type + '&nbsp;' + t.number + maybeShowLabel(_ref) + '</a>';
33773377
} else {
33783378
console.log("Reference to undefined '" + type + " [" + _ref + "]'");
33793379
return _type + ' ?';
@@ -3389,8 +3389,8 @@ function markdeepToHTML(str, elementMode) {
33893389
url = url.ss(0, url.length - 1);
33903390
extra = '.';
33913391
}
3392-
// svn and perforce URLs are not hyperlinked. All others (http/https/ftp/mailto/tel, etc. are)
3393-
return '<a ' + ((url[0] !== 's' && url[0] !== 'p') ? protect('href="' + url + '" class="url"') : '') + '>' + url + '</a>' + extra;
3392+
// svn, perforce, and quadplay URLs are not hyperlinked. All others (http/https/ftp/mailto/tel, etc. are)
3393+
return '<a ' + (! (url.startsWith('svn') || url.startsWith('p4') || url.startsWith('quad')) ? protect('href="' + url + '" class="url"') : '') + '>' + url + '</a>' + extra;
33943394
});
33953395

33963396
if (! elementMode) {
@@ -3437,7 +3437,7 @@ function markdeepToHTML(str, elementMode) {
34373437
function (match, prefix, ref) {
34383438
var link = toc[ref.toLowerCase().trim()];
34393439
if (link) {
3440-
return prefix + ' <a ' + protect('href="#toc' + link + '"') + '>' + link + '</a>';
3440+
return prefix + ' <a ' + protect('href="#toc' + link + '" target="_self"') + '>' + link + '</a>';
34413441
} else {
34423442
return prefix + ' ?';
34433443
}
@@ -3508,7 +3508,7 @@ function markdeepToHTML(str, elementMode) {
35083508
// They may also have an extra syntax-highlighting span
35093509
str = str.rp(/<code(?! ignore)\b[^<>\n]*>(<span class="[a-zA-Z\-_0-9]+">)?([A-Za-z_][A-Za-z_\.0-9:\->]*)(<\/span>)?(\(\)|\[\])?<\/code>/g, function (match, syntaxHighlight, name, syntaxHighlightEnd, next) {
35103510
var linkName = name + (next ? (next[0] === '(' ? '-fcn' : next[0] === '[' ? '-array' : next[0]) : '');
3511-
return apiDefinitionCount[linkName] ? entag('a', match, 'href="#apiDefinition-' + linkName + '"') : match;
3511+
return apiDefinitionCount[linkName] ? entag('a', match, 'href="#apiDefinition-' + linkName + '" target="_self"') : match;
35123512
});
35133513
}
35143514

@@ -4864,9 +4864,6 @@ function processInsertCommands(nodeArray, sourceArray, insertDoneCallback) {
48644864
//
48654865
// A url is relative if it does not begin with '^[a-z]{3,6}://|^#'
48664866

4867-
// Protect code fences
4868-
// TODO
4869-
48704867
function makeAbsoluteURL(url) {
48714868
return (/^[a-z]{3,6}:\/\//.test(url)) ?
48724869
url :
@@ -5360,6 +5357,13 @@ if (! window.alreadyProcessedMarkdeep) {
53605357
// to appear exceedingly narrow on phones in the Chrome mobile preview.
53615358
// https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
53625359
var META = '<meta charset="UTF-8"><meta http-equiv="content-type" content="text/html;charset=UTF-8"><meta name="viewport" content="width=600, initial-scale=1">';
5360+
// Add a base tag if embedded in an <iframe srcdoc=""> inline
5361+
// (not an <iframe src="">). This allows # links generated by
5362+
// the table of contents to work correctly.
5363+
if (document.location.href === 'about:srcdoc') {
5364+
META += '<base href="about:srcdoc"><base target="_blank">';
5365+
}
5366+
53635367
var head = META + BODY_STYLESHEET + STYLESHEET + sectionNumberingStylesheet() + HIGHLIGHT_STYLESHEET;
53645368
if (longDocument) {
53655369
// Add more spacing before the title in a long document

‎1.17/markdeep.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎1.17/slate.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ body#md {
66
line-height: 170%;
77
}
88

9+
@media screen and (max-width: 100em) {
10+
body#md {
11+
padding: 4px;
12+
}
13+
}
914

1015
/* reset heading/link fonts to that of body */
1116
.md a,
@@ -103,7 +108,7 @@ body#md {
103108

104109

105110
/* Wide screen: TOC on side */
106-
@media screen and (min-width: 750px) {
111+
@media screen and (min-width: 40em) {
107112
.md .longTOC {
108113
display: block;
109114
white-space: nowrap;

‎latest/markdeep.js

+18-14
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ function insertTableOfContents(s, protect, exposer) {
23912391
// Gather headers for table of contents (TOC). We
23922392
// accumulate a long and short TOC and then choose which
23932393
// to insert at the end.
2394-
var fullTOC = '<a href="#" class="tocTop">(Top)</a><br/>\n';
2394+
var fullTOC = '<a href="#" class="tocTop" target="_self">(Top)</a><br/>\n';
23952395
var shortTOC = '';
23962396

23972397
// names of parent sections
@@ -2443,10 +2443,10 @@ function insertTableOfContents(s, protect, exposer) {
24432443
// Only insert for the first three levels
24442444
if (level <= tocDepth) {
24452445
// Indent and append (the Array() call generates spaces)
2446-
fullTOC += Array(level).join('&nbsp;&nbsp;') + '<a href="#' + name + '" class="level' + level + '"><span class="tocNumber">' + number + '&nbsp; </span>' + text + '</a><br/>\n';
2446+
fullTOC += Array(level).join('&nbsp;&nbsp;') + '<a href="#' + name + '" target="_self" class="level' + level + '"><span class="tocNumber">' + number + '&nbsp; </span>' + text + '</a><br/>\n';
24472447

24482448
if (level === 1) {
2449-
shortTOC += ' &middot; <a href="#' + name + '">' + text + '</a>';
2449+
shortTOC += ' &middot; <a href="#' + name + '" target="_self">' + text + '</a>';
24502450
} else {
24512451
++numAboveLevel1;
24522452
}
@@ -2939,7 +2939,7 @@ function markdeepToHTML(str, elementMode) {
29392939
endNoteTable[symbolicName] = endNoteCount;
29402940
}
29412941

2942-
return '<sup><a ' + protect('href="#endnote-' + symbolicName + '"') +
2942+
return '<sup><a ' + protect('href="#endnote-' + symbolicName + '" target="_self"') +
29432943
'>' + endNoteTable[symbolicName] + '</a></sup>';
29442944
}
29452945
str = str.rp(/[ \t]*\[\^([^\]\n\t ]+)\](?!:)/g, endNote);
@@ -2963,7 +2963,7 @@ function markdeepToHTML(str, elementMode) {
29632963
for (var i = 0; i < symbolicNameList.length; ++i) {
29642964
// Strip spaces and # signs
29652965
var name = symbolicNameList[i].rp(/#| /g, '');
2966-
s += entag('a', name, protect('href="#citation-' + name.toLowerCase() + '"'));
2966+
s += entag('a', name, protect('href="#citation-' + name.toLowerCase() + '" target="_self"'));
29672967
if (i < symbolicNameList.length - 1) { s += ', '; }
29682968
}
29692969
return s + ']';
@@ -3346,7 +3346,7 @@ function markdeepToHTML(str, elementMode) {
33463346
if (allHeaders) {
33473347
allHeaders.forEach(function (header) {
33483348
header = removeHTMLTags(header.ss(4, header.length - 5)).trim();
3349-
var link = '<a ' + protect('href="#' + mangle(header) + '"') + '>';
3349+
var link = '<a ' + protect('href="#' + mangle(header) + '" target="_self"') + '>';
33503350

33513351
var sectionExp = '(' + keyword('section') + '|' + keyword('subsection') + '|' + keyword('chapter') + ')';
33523352
var headerExp = '(\\b' + escapeRegExpCharacters(header) + ')';
@@ -3373,7 +3373,7 @@ function markdeepToHTML(str, elementMode) {
33733373

33743374
if (t) {
33753375
t.used = true;
3376-
return '<a ' + protect('href="#' + ref + '"') + '>' + _type + '&nbsp;' + t.number + maybeShowLabel(_ref) + '</a>';
3376+
return '<a ' + protect('href="#' + ref + '" target="_self"') + '>' + _type + '&nbsp;' + t.number + maybeShowLabel(_ref) + '</a>';
33773377
} else {
33783378
console.log("Reference to undefined '" + type + " [" + _ref + "]'");
33793379
return _type + ' ?';
@@ -3389,8 +3389,8 @@ function markdeepToHTML(str, elementMode) {
33893389
url = url.ss(0, url.length - 1);
33903390
extra = '.';
33913391
}
3392-
// svn and perforce URLs are not hyperlinked. All others (http/https/ftp/mailto/tel, etc. are)
3393-
return '<a ' + ((url[0] !== 's' && url[0] !== 'p') ? protect('href="' + url + '" class="url"') : '') + '>' + url + '</a>' + extra;
3392+
// svn, perforce, and quadplay URLs are not hyperlinked. All others (http/https/ftp/mailto/tel, etc. are)
3393+
return '<a ' + (! (url.startsWith('svn') || url.startsWith('p4') || url.startsWith('quad')) ? protect('href="' + url + '" class="url"') : '') + '>' + url + '</a>' + extra;
33943394
});
33953395

33963396
if (! elementMode) {
@@ -3437,7 +3437,7 @@ function markdeepToHTML(str, elementMode) {
34373437
function (match, prefix, ref) {
34383438
var link = toc[ref.toLowerCase().trim()];
34393439
if (link) {
3440-
return prefix + ' <a ' + protect('href="#toc' + link + '"') + '>' + link + '</a>';
3440+
return prefix + ' <a ' + protect('href="#toc' + link + '" target="_self"') + '>' + link + '</a>';
34413441
} else {
34423442
return prefix + ' ?';
34433443
}
@@ -3508,7 +3508,7 @@ function markdeepToHTML(str, elementMode) {
35083508
// They may also have an extra syntax-highlighting span
35093509
str = str.rp(/<code(?! ignore)\b[^<>\n]*>(<span class="[a-zA-Z\-_0-9]+">)?([A-Za-z_][A-Za-z_\.0-9:\->]*)(<\/span>)?(\(\)|\[\])?<\/code>/g, function (match, syntaxHighlight, name, syntaxHighlightEnd, next) {
35103510
var linkName = name + (next ? (next[0] === '(' ? '-fcn' : next[0] === '[' ? '-array' : next[0]) : '');
3511-
return apiDefinitionCount[linkName] ? entag('a', match, 'href="#apiDefinition-' + linkName + '"') : match;
3511+
return apiDefinitionCount[linkName] ? entag('a', match, 'href="#apiDefinition-' + linkName + '" target="_self"') : match;
35123512
});
35133513
}
35143514

@@ -4864,9 +4864,6 @@ function processInsertCommands(nodeArray, sourceArray, insertDoneCallback) {
48644864
//
48654865
// A url is relative if it does not begin with '^[a-z]{3,6}://|^#'
48664866

4867-
// Protect code fences
4868-
// TODO
4869-
48704867
function makeAbsoluteURL(url) {
48714868
return (/^[a-z]{3,6}:\/\//.test(url)) ?
48724869
url :
@@ -5360,6 +5357,13 @@ if (! window.alreadyProcessedMarkdeep) {
53605357
// to appear exceedingly narrow on phones in the Chrome mobile preview.
53615358
// https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
53625359
var META = '<meta charset="UTF-8"><meta http-equiv="content-type" content="text/html;charset=UTF-8"><meta name="viewport" content="width=600, initial-scale=1">';
5360+
// Add a base tag if embedded in an <iframe srcdoc=""> inline
5361+
// (not an <iframe src="">). This allows # links generated by
5362+
// the table of contents to work correctly.
5363+
if (document.location.href === 'about:srcdoc') {
5364+
META += '<base href="about:srcdoc"><base target="_blank">';
5365+
}
5366+
53635367
var head = META + BODY_STYLESHEET + STYLESHEET + sectionNumberingStylesheet() + HIGHLIGHT_STYLESHEET;
53645368
if (longDocument) {
53655369
// Add more spacing before the title in a long document

‎latest/markdeep.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎latest/slate.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ body#md {
66
line-height: 170%;
77
}
88

9+
@media screen and (max-width: 100em) {
10+
body#md {
11+
padding: 4px;
12+
}
13+
}
914

1015
/* reset heading/link fonts to that of body */
1116
.md a,
@@ -103,7 +108,7 @@ body#md {
103108

104109

105110
/* Wide screen: TOC on side */
106-
@media screen and (min-width: 750px) {
111+
@media screen and (min-width: 40em) {
107112
.md .longTOC {
108113
display: block;
109114
white-space: nowrap;

0 commit comments

Comments
 (0)