diff options
Diffstat (limited to 'vendor/league/html-to-markdown/src')
3 files changed, 27 insertions, 5 deletions
diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php index dafec077c..f737b4e19 100644 --- a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -2,11 +2,26 @@ namespace League\HTMLToMarkdown\Converter; +use League\HTMLToMarkdown\Configuration; +use League\HTMLToMarkdown\ConfigurationAwareInterface; use League\HTMLToMarkdown\ElementInterface; -class ListItemConverter implements ConverterInterface +class ListItemConverter implements ConverterInterface, ConfigurationAwareInterface { /** + * @var Configuration + */ + protected $config; + + /** + * @param Configuration $config + */ + public function setConfig(Configuration $config) + { + $this->config = $config; + } + + /** * @param ElementInterface $element * * @return string @@ -29,10 +44,15 @@ class ListItemConverter implements ConverterInterface } if ($list_type === 'ul') { - return $prefix . '- ' . $value . "\n"; + $list_item_style = $this->config->getOption('list_item_style', '-'); + return $prefix . $list_item_style . ' ' . $value . "\n"; } - $number = $element->getSiblingPosition(); + if ($list_type === 'ol' && $start = $element->getParent()->getAttribute('start')) { + $number = $start + $element->getSiblingPosition() - 1; + } else { + $number = $element->getSiblingPosition(); + } return $prefix . $number . '. ' . $value . "\n"; } diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php index cf852bfcf..7207b81a6 100644 --- a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php @@ -109,7 +109,8 @@ class ParagraphConverter implements ConverterInterface { $regExs = array( // Match numbers ending on ')' or '.' that are at the beginning of the line. - '/^[0-9]+(?=\)|\.)/' + // They will be escaped if immediately followed by a space or newline. + '/^[0-9]+(?=(\)|\.)( |$))/' ); foreach ($regExs as $i) { diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/src/HtmlConverter.php index db3c29e1c..8d8936ec5 100644 --- a/vendor/league/html-to-markdown/src/HtmlConverter.php +++ b/vendor/league/html-to-markdown/src/HtmlConverter.php @@ -38,7 +38,8 @@ class HtmlConverter 'bold_style' => '**', // Set to '__' if you prefer the underlined style 'italic_style' => '_', // Set to '*' if you prefer the asterisk style 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: 'meta style script' - 'hard_break' => false,// Set to true to turn <br> into `\n` instead of ` \n` + 'hard_break' => false, // Set to true to turn <br> into `\n` instead of ` \n` + 'list_item_style' => '-', // Set the default character for each <li> in a <ul>. Can be '-', '*', or '+' ); $this->environment = Environment::createDefaultEnvironment($defaults); |