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

Text markups work

This commit is contained in:
Christophe HENRY 2021-03-03 16:40:22 +01:00
parent 96c1303663
commit 04a7fe7484
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htmgem.php
View File

@ -75,12 +75,13 @@ function addTextAttributes(&$line) {
* Escapes the HTML entities yet contained in the Gemtext, keeps multiple spaces.
* @param $text1, $text2 texts to process
*/
function htmlEscape(&$text1, &$text2=null) {
$text1 = htmlspecialchars($text1, ENT_HTML5, "UTF-8", false);
function htmlEscape(&$text) {
$text = htmlspecialchars($text, ENT_HTML5, "UTF-8", false);
}
function keepSpaces(&$text) {
# https://en.wikipedia.org/wiki/Whitespace_character#Unicode
$text1 = preg_replace("# #", "  ", $text1); #TODO: a way to not touch single spaces as " " > " "
if (!is_null($text2)) return htmlEscape($text2);
$text = preg_replace("# #", "  ", $text);
}
$mode = null;
@ -100,6 +101,7 @@ foreach ($fileLines as $line) {
$h_level = strlen($sharps[1]);
$text = $sharps[2];
htmlEscape($text);
keepSpaces($text);
switch ($h_level) {
case 1: print("<h1>".$text."</h1>\n"); break;
case 2: print("<h2>".$text."</h2>\n"); break;
@ -110,12 +112,14 @@ foreach ($fileLines as $line) {
$url_link = $linkParts[1];
$url_label = $linkParts[2];
if (empty($url_label)) $url_label = $url_link;
htmlEscape($url_link, $url_label);
htmlEscape($url_link);
keepSpaces($url_link);
htmlEscape($url_label);
keepSpaces($url_label);
if ($mode_textAttributes) addTextAttributes($url_label);
print("<p><a href='".$url_link."'>".$url_label."</a></p>\n");
} elseif ('"""' == $line3) {
$mode_textAttributes = !$mode_textAttributes;
$reDo = true;
} elseif ("```" == $line3) {
$mode="pre";
print("<pre>\n");
@ -128,6 +132,7 @@ foreach ($fileLines as $line) {
print("<p>&nbsp;</p>\n");
else
htmlEscape($quote);
keepSpaces($quote);
print("<p>".$quote."</p>\n");
} elseif ("*" == $line1 && "**" != $line2) {
$mode = "ul";
@ -135,6 +140,7 @@ foreach ($fileLines as $line) {
print("<ul>\n");
} else {
htmlEscape($line);
keepSpaces($line);
if ($mode_textAttributes) addTextAttributes($line);
print("<p>$line</p>\n");
}
@ -155,6 +161,7 @@ foreach ($fileLines as $line) {
print("<p>&nbsp;</p>\n");
else
htmlEscape($quote);
keepSpaces($quote);
print("<p>".$quote."</p>\n");
} else {
print("</blockquote>\n");
@ -169,6 +176,7 @@ foreach ($fileLines as $line) {
print("<li>&nbsp;\n");
else
htmlEscape($li);
keepSpaces($li);
print("<li>".$li."\n");
} else {
$mode = null;
@ -176,7 +184,6 @@ foreach ($fileLines as $line) {
$reDo = true;
}
}
$line = "";
}
}

6
tests/test.gmi
View File

@ -61,16 +61,16 @@ At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praese
"""
```
Preformatted text with **bold**, //italic//, and so on…
Preformatted text with **bold**, //italic//, and so on… But still not <b>HTML stuff.
```
# Quotations
## Two consecutives lines of quotations
## Two consecutives physical lines of quotations
> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
> Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
## Two separated lines of quotations
## Two separated physical lines of quotations
> Quotations: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
> Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.