aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-10-31 01:32:44 +0100
committerM. Dent <dentm42@gmail.com>2018-10-31 01:32:44 +0100
commitf9ab7647dd660adb37464614616cb8484c500de4 (patch)
treea3155f3820e9c4e86941a13d878a914b35941a61 /include
parent046d264688aae76874fa22870f4bed77192335c2 (diff)
parentfc6ff45c4976d158ac565a7693b2e4d30fe70e33 (diff)
downloadvolse-hubzilla-f9ab7647dd660adb37464614616cb8484c500de4.tar.gz
volse-hubzilla-f9ab7647dd660adb37464614616cb8484c500de4.tar.bz2
volse-hubzilla-f9ab7647dd660adb37464614616cb8484c500de4.zip
Merge branch 'composer-updates' into 'dev'
update html_to_markdown, smarty and sabredav libs via composer See merge request hubzilla/core!1361
Diffstat (limited to 'include')
-rw-r--r--include/markdown.php26
1 files changed, 14 insertions, 12 deletions
diff --git a/include/markdown.php b/include/markdown.php
index d2148811c..64f0a0854 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -248,20 +248,12 @@ function bb_to_markdown($Text, $options = []) {
// Convert it to HTML - don't try oembed
$Text = bbcode($Text, [ 'tryoembed' => false ]);
- // Markdownify does not preserve previously escaped html entities such as <> and &.
- //$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
-
// Now convert HTML to Markdown
-
$Text = html2markdown($Text);
//html2markdown adds backslashes infront of hashes after a new line. remove them
$Text = str_replace("\n\#", "\n#", $Text);
- // It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
-
- //$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
-
// If the text going into bbcode() has a plain URL in it, i.e.
// with no [url] tags around it, it will come out of parseString()
// looking like: <http://url.com>, which gets removed by strip_tags().
@@ -291,12 +283,24 @@ function bb_to_markdown($Text, $options = []) {
* If the HTML text can not get parsed it will return an empty string.
*
* @param string $html The HTML code to convert
+ * @param array $options an array of options to pass to the environment
* @return string Markdown representation of the given HTML text, empty on error
*/
-function html2markdown($html,$options = []) {
+function html2markdown($html, $options = []) {
$markdown = '';
- $internal_errors = libxml_use_internal_errors(true);
+ if(! $options) {
+ $options = [
+ 'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2
+ 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML
+ 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output.
+ 'bold_style' => '**', // DEPRECATED: Set to '__' if you prefer the underlined style
+ 'italic_style' => '*', // DEPRECATED: Set to '_' if you prefer the underlined 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`
+ 'list_item_style' => '-', // Set the default character for each <li> in a <ul>. Can be '-', '*', or '+'
+ ];
+ }
$environment = Environment::createDefaultEnvironment($options);
$environment->addConverter(new TableConverter());
@@ -308,8 +312,6 @@ function html2markdown($html,$options = []) {
logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
}
- libxml_use_internal_errors($internal_errors);
-
return $markdown;
}