Sbgodin
/
HtmGem
1
0
Fork 1
Code Issues 1 Pull Requests 1 Releases Activity

Merge remote-tracking branch master into dev

This commit is contained in:
Christophe HENRY 2021-03-24 11:18:57 +01:00
parent 64b5c1506a 4e42fed6b4
commit 7b58fc1a26
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/htmgem.css
View File

@ -114,7 +114,7 @@ pre {
h3 {
font-size: 3rem;
}
p, pre, ul {
p, pre, ul, blockquote {
font-size: 2.6rem;
}
}

2
index.gmi
View File

@ -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;

2
index.php
View File

@ -79,7 +79,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>

5
lib-htmgem.php
View File

@ -244,7 +244,7 @@ class GemtextTranslate_html {
if (empty($text)) {
$text = "&nbsp;";
} 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
@ -295,6 +295,9 @@ class GemtextTranslate_html {
$linkText = $link;
self::htmlPrepare($linkText);
} else {
// Don't double encode, just escapes quotes, "<" and ">".
// So "I'm&gt" becomes "I&apos;&gt". The & remains untouched.
$link = htmlspecialchars($link, ENT_HTML5|ENT_QUOTES, "UTF-8", false);
self::htmlPrepare($linkText);
if ($textDecoration) self::addTextDecoration($linkText);
}