mirror of https://tildegit.org/sbgodin/HtmGem.git
Compare commits
5 Commits
cef2417f91
...
4e42fed6b4
Author | SHA1 | Date |
---|---|---|
Christophe HENRY | 4e42fed6b4 | |
Christophe HENRY | c1299a2bdb | |
Christophe HENRY | 710bd1bf07 | |
Christophe HENRY | 731a8eef6a | |
Christophe HENRY | 5df9d5ff15 |
|
@ -114,7 +114,7 @@ pre {
|
|||
h3 {
|
||||
font-size: 3rem;
|
||||
}
|
||||
p, pre, ul {
|
||||
p, pre, ul, blockquote {
|
||||
font-size: 2.6rem;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,7 +88,7 @@ Lorsque l’option css est activé dans la configuration (voir //rewrite// plus
|
|||
## Réécriture d’URL pour préciser le style à utiliser
|
||||
|
||||
Modifier la configuration du serveur web fonctionne mais est assez lourd. On peut tester un style en particulier de la façon suivante :
|
||||
> https://site.tld/htmgem/index.php?url=/url/page.gmi&style=<…>
|
||||
> https://site.tld/htmgem/index.php?url=/url/page.gmi&style=<…>
|
||||
|
||||
Il est aussi possible de faire une réécriture d’URL qui intègre le style :
|
||||
> rewrite ^(.+\.gmi)$ /htmgem/?url=$1;
|
||||
|
|
|
@ -80,7 +80,7 @@ if ("source" == $style) {
|
|||
# Gets the page title: the first occurrence with # at the line start
|
||||
mb_ereg("#\s*([^\n]+)\n", $fileContents, $matches);
|
||||
$page_title = @$matches[1];
|
||||
$fileContents = htmlspecialchars($fileContents, ENT_HTML5|ENT_NOQUOTES, "UTF-8", false);
|
||||
$fileContents = htmlspecialchars($fileContents, ENT_HTML5|ENT_QUOTES, "UTF-8", true);
|
||||
echo <<<EOL
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
|
|
@ -168,7 +168,7 @@ class GemtextTranslate_html {
|
|||
protected $pageTitle = "";
|
||||
public $translatedGemtext;
|
||||
|
||||
function __construct($parsedGemtext, $textDecorationEnabled=true) {
|
||||
function __construct($parsedGemtext, $textDecoration=true) {
|
||||
if (empty($parsedGemtext))
|
||||
$parsedGemtext = "";
|
||||
elseif (is_string($parsedGemtext))
|
||||
|
@ -177,7 +177,7 @@ class GemtextTranslate_html {
|
|||
// The text must be parsed
|
||||
$parsedGemtext = gemtextParser($parsedGemtext);
|
||||
$this->parsedGemtext = $parsedGemtext;
|
||||
$this->translate($textDecorationEnabled);
|
||||
$this->translate($textDecoration);
|
||||
}
|
||||
|
||||
function addCss($css) {
|
||||
|
@ -232,7 +232,7 @@ class GemtextTranslate_html {
|
|||
if (empty($text)) {
|
||||
$text = " ";
|
||||
} else {
|
||||
$text = htmlspecialchars($text, ENT_HTML5|ENT_NOQUOTES, "UTF-8", false);
|
||||
$text = htmlspecialchars($text, ENT_HTML5|ENT_QUOTES, "UTF-8", true);
|
||||
$text = mb_ereg_replace("\ ([?!:;»€$])", self::NARROW_NO_BREAK_SPACE."\\1", $text);
|
||||
$text = mb_ereg_replace("([«])\ ", "\\1".self::NARROW_NO_BREAK_SPACE, $text); # Espace fine insécable
|
||||
|
||||
|
@ -271,9 +271,11 @@ class GemtextTranslate_html {
|
|||
echo "<pre>\n$text\n</pre>\n";
|
||||
break;
|
||||
case ">":
|
||||
$text = implode("\n", $node["texts"]);
|
||||
self::htmlPrepare($text);
|
||||
if ($textDecoration) self::addTextDecoration($text);
|
||||
foreach ($node["texts"] as &$text) {
|
||||
self::htmlPrepare($text);
|
||||
if ($textDecoration) self::addTextDecoration($text);
|
||||
}
|
||||
$text = implode("<br>\n", $node["texts"]);
|
||||
echo "<blockquote>\n$text\n</blockquote>\n";
|
||||
break;
|
||||
case "=>":
|
||||
|
@ -283,6 +285,9 @@ class GemtextTranslate_html {
|
|||
$linkText = $link;
|
||||
self::htmlPrepare($linkText);
|
||||
} else {
|
||||
// Don't double encode, just escapes quotes, "<" and ">".
|
||||
// So "I'm>" becomes "I'>". The & remains untouched.
|
||||
$link = htmlspecialchars($link, ENT_HTML5|ENT_QUOTES, "UTF-8", false);
|
||||
self::htmlPrepare($linkText);
|
||||
if ($textDecoration) self::addTextDecoration($linkText);
|
||||
}
|
||||
|
@ -308,7 +313,7 @@ class GemtextTranslate_html {
|
|||
echo "<h3>$title</h3>\n";
|
||||
break;
|
||||
case "^^^":
|
||||
$this->textDecorationEnabled = !$this->textDecorationEnabled;
|
||||
$textDecoration = !$textDecoration;
|
||||
break;
|
||||
default:
|
||||
die("Unknown mode: '{$node["mode"]}'\n");
|
||||
|
|
Loading…
Reference in New Issue