This commit is contained in:
Christophe HENRY 2021-03-18 14:43:02 +01:00
parent 859b0aad81
commit d280ceff94
2 changed files with 18 additions and 19 deletions

View File

@ -83,24 +83,24 @@ $fileContents</pre>
</html>
EOL;
exit();
} else {
$t = new \htmgem\GemTextTranslate_html($fileContents);
if ("none" == $style) {
$t->addCss("");
} elseif ("/" == @$style[0]) {
$t->addCss($style);
} elseif (empty($style)) {
$parts = pathinfo($filePath);
$localCss = $parts["filename"].".css";
$localCssFilePath = $parts["dirname"]."/".$localCss;
if (file_exists($localCssFilePath)) {
# Warning, using htmhem.php?url=… will make $localCss not found
# as the path is relative to htmgem.php and not / !
$t->addCss($localCss);
}
} else { #TODO: regex check for $style
$t->addCss("/htmgem/css/$style.css");
}
$t = new \htmgem\GemTextTranslate_html($fileContents, $textDecoration);
if ("none" == $style) {
$t->addCss("");
} elseif ("/" == @$style[0]) {
$t->addCss($style);
} elseif (empty($style)) {
$parts = pathinfo($filePath);
$localCss = $parts["filename"].".css";
$localCssFilePath = $parts["dirname"]."/".$localCss;
if (file_exists($localCssFilePath)) {
# Warning, using htmhem.php?url=… will make $localCss not found
# as the path is relative to htmgem.php and not / !
$t->addCss($localCss);
}
} else { #TODO: regex check for $style
$t->addCss("/htmgem/css/$style.css");
}
echo $t->getFullHtml();

View File

@ -170,8 +170,7 @@ class GemtextTranslate_html {
function __construct($parsedGemtext, $textDecorationEnabled=true) {
if (empty($parsedGemtext))
// So translate() will do no loop.
$parsedGemtext = array();
$parsedGemtext = "";
elseif (is_string($parsedGemtext))
// to delete the last empty line, <p>&nbsp;</p> in HTML
$parsedGemtext = rtrim($parsedGemtext);