From 0a0bc0cfdeb5c7f179f2ea95acfc35d7cfafbcf5 Mon Sep 17 00:00:00 2001 From: JT Date: Thu, 13 Sep 2012 14:03:57 +0100 Subject: [PATCH] 0.1.7 --- History.md.html | 16 ++ docker.html | 2 +- lib/showdown.js.html | 504 +++++++++++++++++++++---------------------- src/docker.js.html | 4 +- 4 files changed, 263 insertions(+), 263 deletions(-) diff --git a/History.md.html b/History.md.html index efceae4..25cd294 100644 --- a/History.md.html +++ b/History.md.html @@ -21,6 +21,9 @@
Docker Version History
+
+ 0.1.7 +
0.1.6
@@ -82,6 +85,19 @@

+
+

+ + 0.1.7 +

+
+ + + + +

diff --git a/docker.html b/docker.html index cac9466..18145a5 100644 --- a/docker.html +++ b/docker.html @@ -80,7 +80,7 @@

docker

All program arguments using commander

program
-  .version('0.1.6')
+  .version('0.1.7')
   .option('-i, --input_dir [dir]', 'Input directory (defaults to current dir)', pwd)
   .option('-o, --output_dir [dir]', 'Output directory (defaults to ./doc)', path.join(pwd, 'doc') )
   .option('-u, --updated_files', 'Only process files that have been changed')
diff --git a/lib/showdown.js.html b/lib/showdown.js.html
index eef123a..322fe4a 100644
--- a/lib/showdown.js.html
+++ b/lib/showdown.js.html
@@ -396,24 +396,24 @@ 
showdown.js

var text = text.replace(/ - ^[ ]{0,3}[(.+)]: // id = $1 attacklab: g_tab_width - 1 - [ \t]* - \n? // maybe one newline - [ \t]* - ? // url = $2 - [ \t]* - \n? // maybe one newline - [ \t]* - (?: - (\n) // any lines skipped = $3 attacklab: lookbehind removed - ["(] - (.+?) // title = $4 - [")] - [ \t] - )? // title is optional - (?:\n+|$) - /gm, - function(){...});

+^[ ]{0,3}[(.+)]: // id = $1 attacklab: g_tab_width - 1 +[ \t]* +\n? // maybe one newline +[ \t]* +? // url = $2 +[ \t]* +\n? // maybe one newline +[ \t]* +(?: +(\n) // any lines skipped = $3 attacklab: lookbehind removed +["(] +(.+?) // title = $4 +[")] +[ \t] +)? // title is optional +(?:\n+|$) +/gm, +function(){...});

@@ -513,17 +513,17 @@

showdown.js

var text = text.replace(/ - ( // save in $1 - ^ // start of line (with /m) - <($block_tags_a) // start tag = $2 - \b // word break - // attacklab: hack around khtml/pcre bug... - [^\r]?\n // any number of lines, minimally matching - // the matching end tag - [ \t] // trailing spaces/tabs - (?=\n+) // followed by a newline - ) // attacklab: there are sentinel newlines at end of document - /gm,function(){...}};

+( // save in $1 +^ // start of line (with /m) +<($block_tags_a) // start tag = $2 +\b // word break +// attacklab: hack around khtml/pcre bug... +[^\r]?\n // any number of lines, minimally matching + // the matching end tag +[ \t] // trailing spaces/tabs +(?=\n+) // followed by a newline +) // attacklab: there are sentinel newlines at end of document +/gm,function(){...}};

@@ -549,17 +549,17 @@

showdown.js

var text = text.replace(/ - ( // save in $1 - ^ // start of line (with /m) - <($block_tags_b) // start tag = $2 - \b // word break - // attacklab: hack around khtml/pcre bug... - [^\r]? // any number of lines, minimally matching - . // the matching end tag - [ \t]* // trailing spaces/tabs - (?=\n+) // followed by a newline - ) // attacklab: there are sentinel newlines at end of document - /gm,function(){...}};

+( // save in $1 +^ // start of line (with /m) +<($block_tags_b) // start tag = $2 +\b // word break +// attacklab: hack around khtml/pcre bug... +[^\r]? // any number of lines, minimally matching +. // the matching end tag +[ \t]* // trailing spaces/tabs +(?=\n+) // followed by a newline +) // attacklab: there are sentinel newlines at end of document +/gm,function(){...}};

@@ -586,17 +586,17 @@

showdown.js

text = text.replace(/ - ( // save in $1 - \n\n // Starting after a blank line - [ ]{0,3} - (<(hr) // start tag = $2 - \b // word break - ([^<>])? // - \/?>) // the matching end tag - [ \t] - (?=\n{2,}) // followed by a blank line - ) - /g,hashElement);

+( // save in $1 +\n\n // Starting after a blank line +[ ]{0,3} +(<(hr) // start tag = $2 +\b // word break +([^<>])? // +\/?>) // the matching end tag +[ \t] +(?=\n{2,}) // followed by a blank line +) +/g,hashElement);

@@ -622,16 +622,16 @@

showdown.js

text = text.replace(/ - ( // save in $1 - \n\n // Starting after a blank line - [ ]{0,3} // attacklab: g_tab_width - 1 - - [ \t]* - (?=\n{2,}) // followed by a blank line - ) - /g,hashElement);

+( // save in $1 +\n\n // Starting after a blank line +[ ]{0,3} // attacklab: g_tab_width - 1 + +[ \t]* +(?=\n{2,}) // followed by a blank line +) +/g,hashElement);

@@ -657,20 +657,20 @@

showdown.js

text = text.replace(/ - (?: - \n\n // Starting after a blank line - ) - ( // save in $1 - [ ]{0,3} // attacklab: g_tab_width - 1 - (?: - <([?%]) // $2 - [^\r]? - \2> - ) - [ \t] - (?=\n{2,}) // followed by a blank line - ) - /g,hashElement);

+(?: +\n\n // Starting after a blank line +) +( // save in $1 +[ ]{0,3} // attacklab: g_tab_width - 1 +(?: +<([?%]) // $2 +[^\r]? +\2> +) +[ \t] +(?=\n{2,}) // followed by a blank line +) +/g,hashElement);

@@ -885,30 +885,25 @@

showdown.js

text = text.replace(/ - ( // wrap whole match in $1 - [ - ( - (?: - [[^]]] // allow brackets nested one level - | - [^[] // or anything else - ) - ) - ]

+( // wrap whole match in $1 +[ +( +(?: +[[^]]] // allow brackets nested one level +| +[^[] // or anything else +) +) +] +[ ]? // one optional space +(?:\n[ ])? // one optional newline followed by spaces +[ +(.?) // id = $3 +] +)()()()() // pad remaining backreferences +/g,_DoAnchors_callback);

-

[ ]? // one optional space - (?:\n[ ]*)? // one optional newline followed by spaces

- - -
\[
-(.*?)         // id = $3
-\]
-
- - - -

)()()()() // pad remaining backreferences - /g,_DoAnchors_callback);

+
@@ -932,30 +927,30 @@

showdown.js

text = text.replace(/ - ( // wrap whole match in $1 - [ - ( - (?: - [[^]]] // allow brackets nested one level - | - [^[]] // or anything else - ) - ) - ] - ( // literal paren - [ \t] - () // no id, so leave $3 empty - ?)>? // href = $4 - [ \t] - ( // $5 - (['"]) // quote char = $6 - (.?) // Title = $7 - \6 // matching quote - [ \t] // ignore any spaces/tabs between closing quote and ) - )? // title is optional - ) - ) - /g,writeAnchorTag);

+( // wrap whole match in $1 +[ +( +(?: +[[^]]] // allow brackets nested one level +| +[^[]] // or anything else +) +) +] +( // literal paren +[ \t] +() // no id, so leave $3 empty +?)>? // href = $4 +[ \t] +( // $5 +(['"]) // quote char = $6 +(.?) // Title = $7 +\6 // matching quote +[ \t] // ignore any spaces/tabs between closing quote and ) +)? // title is optional +) +) +/g,writeAnchorTag);

@@ -983,12 +978,12 @@

showdown.js

text = text.replace(/ - ( // wrap whole match in $1 - [ - ([^[]]+) // link text = $2; can't contain '[' or ']' - ] - )()()()()() // pad rest of backreferences - /g, writeAnchorTag);

+( // wrap whole match in $1 +[ +([^[]]+) // link text = $2; can't contain '[' or ']' +] +)()()()()() // pad rest of backreferences +/g, writeAnchorTag);

@@ -1091,24 +1086,19 @@

showdown.js

text = text.replace(/ - ( // wrap whole match in $1 - ![ - (.*?) // alt text = $2 - ]

+( // wrap whole match in $1 +![ +(.?) // alt text = $2 +] +[ ]? // one optional space +(?:\n[ ])? // one optional newline followed by spaces +[ +(.*?) // id = $3 +] +)()()()() // pad rest of backreferences +/g,writeImageTag);

-

[ ]? // one optional space - (?:\n[ ]*)? // one optional newline followed by spaces

- - -
\[
-(.*?)       // id = $3
-\]
-
- - - -

)()()()() // pad rest of backreferences - /g,writeImageTag);

+
@@ -1133,25 +1123,25 @@

showdown.js

text = text.replace(/ - ( // wrap whole match in $1 - ![ - (.?) // alt text = $2 - ] - \s? // One optional whitespace character - ( // literal paren - [ \t] - () // no id, so leave $3 empty - ? // src url = $4 - [ \t]* - ( // $5 - (['"]) // quote char = $6 - (.?) // title = $7 - \6 // matching quote - [ \t] - )? // title is optional - ) - ) - /g,writeImageTag);

+( // wrap whole match in $1 +![ +(.?) // alt text = $2 +] +\s? // One optional whitespace character +( // literal paren +[ \t] +() // no id, so leave $3 empty +? // src url = $4 +[ \t]* +( // $5 +(['"]) // quote char = $6 +(.?) // title = $7 +\6 // matching quote +[ \t] +)? // title is optional +) +) +/g,writeImageTag);

@@ -1283,13 +1273,13 @@

showdown.js

text = text.replace(/ - ^(#{1,6}) // $1 = string of #'s - [ \t]* - (.+?) // $2 = Header text - [ \t]* - #* // optional closing #'s (not counted) - \n+ - /gm, function() {...});

+^(#{1,6}) // $1 = string of #'s +[ \t]* +(.+?) // $2 = Header text +[ \t]* +#* // optional closing #'s (not counted) +\n+ +/gm, function() {...});

@@ -1355,24 +1345,24 @@

showdown.js

var whole_list = / - ( // $1 = whole list - ( // $2 - [ ]{0,3} // attacklab: g_tab_width - 1 - ([+-]|\d+[.]) // $3 = first list item marker - [ \t]+ - ) - [^\r]+? - ( // $4 - ~0 // sentinel for workaround; should be $ - | - \n{2,} - (?=\S) - (?! // Negative lookahead for another list item marker - [ \t] - (?:[*+-]|\d+[.])[ \t]+ - ) - ) - )/g

+( // $1 = whole list +( // $2 +[ ]{0,3} // attacklab: g_tab_width - 1 +([+-]|\d+[.]) // $3 = first list item marker +[ \t]+ +) +[^\r]+? +( // $4 +~0 // sentinel for workaround; should be $ +| +\n{2,} +(?=\S) +(?! // Negative lookahead for another list item marker +[ \t] +(?:[*+-]|\d+[.])[ \t]+ +) +) +)/g

@@ -1511,13 +1501,13 @@

showdown.js

list_str = list_str.replace(/ - (\n)? // leading line = $1 - (^[ \t]) // leading whitespace = $2 - ([+-]|\d+[.]) [ \t]+ // list marker = $3 - ([^\r]+? // list item text = $4 - (\n{1,2})) - (?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+)) - /gm, function(){...});

+(\n)? // leading line = $1 +(^[ \t]) // leading whitespace = $2 +([+-]|\d+[.]) [ \t]+ // list marker = $3 +([^\r]+? // list item text = $4 +(\n{1,2})) +(?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+)) +/gm, function(){...});

@@ -1586,15 +1576,15 @@

showdown.js

text = text.replace(text, - /(?:\n\n|^) - ( // $1 = the code block -- one or more lines, starting with a space/tab - (?: - (?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width - .\n+ - )+ - ) - (\n[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width - /g,function(){...});

+/(?:\n\n|^) +( // $1 = the code block -- one or more lines, starting with a space/tab +(?: +(?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width +.\n+ +)+ +) +(\n[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width +/g,function(){...});

@@ -1625,7 +1615,7 @@

showdown.js

/(?:\n|^) (?{3,}[ a-z]*\n?) // Code fence with optional language ( // $1 = the code block -- one or more lines, and no occurrences of three or more backticks - [^](?:{1,2}[^]+)* +[^](?:{1,2}[^]+)* ) (?:\n*`{3,}) // Closing fence (?:\n|$) // And make sure we get all of the closing fence. Just in case someone used the wrong number of backticks @@ -1738,15 +1728,15 @@

showdown.js

text = text.replace(/ - (^|[^\]) // Character before opening can't be a backslash - (+) // $2 = Opening run of - ( // $3 = The code block - [^\r]*? - [^] // attacklab: work around lack of lookbehind - ) - \2 // Matching closer - (?!`) - /gm, function(){...});

+(^|[^\]) // Character before opening can't be a backslash +(+) // $2 = Opening run of +( // $3 = The code block +[^\r]*? +[^] // attacklab: work around lack of lookbehind +) +\2 // Matching closer +(?!`) +/gm, function(){...});

@@ -1823,43 +1813,35 @@

-

Item

+

Item +// 1. Subitem +// special char: * +//--- +return text; +} +var DoItalicsAndBold = function(text) { +// must go first: +text = text.replace(/(**|)(?=\S)([^\r]*?\S[*])\1/g, +"$2"); +text = text.replace(/(\w)_(\w)/g, "$1~E95E$2") // * JT * "~E95E" == escaped "_" +text = text.replace(/(*|_)(?=\S)([^\r]?\S)\1/g, +"$2"); +return text; +} +var _DoBlockQuotes = function(text) { +/* +text = text.replace(/ +( // Wrap whole match in $1 +( +^[ \t]>[ \t]? // '>' at the start of a line +.+\n // rest of the first line +(.+\n) // subsequent consecutive lines +\n* // blanks +)+ +) +/gm, function(){...});

-

// 1. Subitem

- -

// special char: * -//---

- -

return text; -}

- -

var _DoItalicsAndBold = function(text) {

- -

// must go first: -text = text.replace(/(**|_)(?=\S)([^\r]*?\S[*]*)\1/g, - "$2");

- -

text = text.replace(/(\w)(\w)/g, "$1~E95E$2") // ** JT ** "~E95E" == escaped ""

- -

text = text.replace(/(*|_)(?=\S)([^\r]*?\S)\1/g, - "$2");

- -

return text; -}

- -

var _DoBlockQuotes = function(text) {

- -

/* - text = text.replace(/ - ( // Wrap whole match in $1 - ( - ^[ \t]>[ \t]? // '>' at the start of a line - .+\n // rest of the first line - (.+\n) // subsequent consecutive lines - \n* // blanks - )+ - ) - /gm, function(){...});

+
@@ -2096,7 +2078,7 @@

-

Email addresses: address@domain.foo

+

Email addresses: address@domain.foo


         
@@ -2108,15 +2090,15 @@ 

 

 

   
text = text.replace(/
-    <
-    (?:mailto:)?
-    (
-      [-.\w]+
-      \@
-      [-a-z0-9]+(.[-a-z0-9]+)*.[a-z]+
-    )
-    >
-  /gi, _DoAutoLinks_callback());

+<
+(?:mailto:)?
+(
+[-.\w]+
+\@
+[-a-z0-9]+(.[-a-z0-9]+)*.[a-z]+
+)
+>
+/gi, _DoAutoLinks_callback());

   

   

   

diff --git a/src/docker.js.html b/src/docker.js.html
index aa469e5..5d1494c 100644
--- a/src/docker.js.html
+++ b/src/docker.js.html
@@ -1062,10 +1062,12 @@ 

 

   
 

-
standardize the comment block delimiters to the only ones that
+
Remove whitespace at beginning of each comment line, and
+standardize the comment block delimiters to the only ones that
 dox seems to understand, namely, /* and */

         
         
              multiLine = multiLine
+                .replace(/^\s+/gm, "")
                 .replace(params.multiLine[0], "/**")
                 .replace(params.multiLine[1], "*/")
                 .replace(/\n (?:[^\*])/g, "\n * ");