must go first:
$text = preg_replace_callback('{
( # $1: Marker
- (?:
@@ -1216,9 +1214,10 @@ class Markdown_Parser {
$bq = $this->runBlockGamut($bq); # recurse
$bq = preg_replace('/^/m', " ", $bq);
- # These leading spaces screw with content, so we need to fix that:
+ # These leading spaces cause problem with content,
+ # so we need to fix that:
$bq = preg_replace_callback('{(\s*.+?
)}sx',
- array(&$this, '_DoBlockQuotes_callback2'), $bq);
+ array(&$this, '_DoBlockQuotes_callback2'), $bq);
return $this->hashBlock("\n$bq\n
")."\n\n";
}
@@ -1254,52 +1253,46 @@ class Markdown_Parser {
#
# Unhashify HTML blocks
#
-// foreach ($grafs as $key => $value) {
-// if (isset( $this->html_blocks[$value] )) {
-// $grafs[$key] = $this->html_blocks[$value];
-// }
-// }
-
foreach ($grafs as $key => $graf) {
# Modify elements of @grafs in-place...
if (isset($this->html_blocks[$graf])) {
$block = $this->html_blocks[$graf];
$graf = $block;
- if (preg_match('{
- \A
- ( # $1 = tag
-
]*
- \b
- markdown\s*=\s* ([\'"]) # $2 = attr quote char
- 1
- \2
- [^>]*
- >
- )
- ( # $3 = contents
- .*
- )
- (
) # $4 = closing tag
- \z
- }xs', $block, $matches))
- {
- list(, $div_open, , $div_content, $div_close) = $matches;
-
- # We can't call Markdown(), because that resets the hash;
- # that initialization code should be pulled into its own sub, though.
- $div_content = $this->hashHTMLBlocks($div_content);
-
- # Run document gamut methods on the content.
- foreach ($this->document_gamut as $method => $priority) {
- $div_content = $this->$method($div_content);
- }
-
- $div_open = preg_replace(
- '{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
-
- $graf = $div_open . "\n" . $div_content . "\n" . $div_close;
- }
+// if (preg_match('{
+// \A
+// ( # $1 =
tag
+//
]*
+// \b
+// markdown\s*=\s* ([\'"]) # $2 = attr quote char
+// 1
+// \2
+// [^>]*
+// >
+// )
+// ( # $3 = contents
+// .*
+// )
+// (
) # $4 = closing tag
+// \z
+// }xs', $block, $matches))
+// {
+// list(, $div_open, , $div_content, $div_close) = $matches;
+//
+// # We can't call Markdown(), because that resets the hash;
+// # that initialization code should be pulled into its own sub, though.
+// $div_content = $this->hashHTMLBlocks($div_content);
+//
+// # Run document gamut methods on the content.
+// foreach ($this->document_gamut as $method => $priority) {
+// $div_content = $this->$method($div_content);
+// }
+//
+// $div_open = preg_replace(
+// '{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+// $graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+// }
$grafs[$key] = $graf;
}
}
@@ -1412,21 +1405,23 @@ class Markdown_Parser {
function tokenizeHTML($str) {
#
- # Parameter: String containing HTML markup.
+ # Parameter: String containing HTML + Markdown markup.
# Returns: An array of the tokens comprising the input
- # string. Each token is either a tag (possibly with nested,
- # tags contained therein, such as
, or a
- # run of text between tags. Each element of the array is a
+ # string. Each token is either a tag or a run of text
+ # between tags. Each element of the array is a
# two-element array; the first is either 'tag' or 'text';
# the second is the actual value.
- # Note: Takes code spans into account and does not generate tag
- # tokens inside code spans.
+ # Note: Markdown code spans are taken into account: no tag token is
+ # generated within a code span.
#
$tokens = array();
while ($str != "") {
#
- #
+ # Each loop iteration seach for either the next tag or the next
+ # openning code span marker. If a code span marker is found, the
+ # code span is extracted in entierty and will result in an extra
+ # text token.
#
$parts = preg_split('{
(
@@ -1505,7 +1500,8 @@ class Markdown_Parser {
unset($blocks[0]); # Do not add first block twice.
foreach ($blocks as $block) {
# Calculate amount of space, insert spaces, insert block.
- $amount = $this->tab_width - strlen($line) % $this->tab_width;
+ $amount = $this->tab_width -
+ mb_strlen($line, 'UTF-8') % $this->tab_width;
$line .= str_repeat(" ", $amount) . $block;
}
$text .= "$line\n";
@@ -1556,7 +1552,7 @@ class MarkdownExtra_Parser extends Markdown_Parser {
$this->document_gamut += array(
"stripFootnotes" => 15,
"stripAbbreviations" => 25,
- "appendFootnotes" => 40,
+ "appendFootnotes" => 50,
);
$this->block_gamut += array(
"doTables" => 15,
@@ -2323,22 +2319,26 @@ class MarkdownExtra_Parser extends Markdown_Parser {
# must go first:
$text = preg_replace_callback(array(
'{
- ( (?
+ (?:
[^_]+? # Anthing not em markers.
|
# Balence any regular _ emphasis inside.
- (?
+ (?:
[^*]+? # Anthing not em markers.
|
# Balence any regular * emphasis inside.
- \* (?=\S) (?! \*) (.+?) (?<=\S) \*
+ \* (?=\S) (.+?) (?<=\S) \*
)+?
)
(?<=\S) \*\* # End mark not preceded by whitespace.
@@ -2359,8 +2359,8 @@ class MarkdownExtra_Parser extends Markdown_Parser {
array(&$this, '_doItalicAndBold_strong_callback'), $text);
# Then :
$text = preg_replace_callback(array(
- '{ ( (?\n";
- $text .= "\n";
+ $text .= "