From 750632eaff7a41dcf04352539fd2cab650fa40c4 Mon Sep 17 00:00:00 2001
From: Christophe HENRY <christophe.henry@sbgodin.fr>
Date: Wed, 24 Mar 2021 10:34:17 +0100
Subject: [PATCH] Corrects the engine after unit testing

gemTextParser
* Removes the last empty lines of text files.
* Removes the last spaces (rtrim) even on preformated texts.
* Lines like "# " are possible, meaning an empty title.
* The line "=>" means an empty link.

GemtextTranslate_gemtext
* FIX: writes the alt text of preformated blocks
* Adds a space when quotation lines have value, otherwise lets ">".
* Adds a space when the link has values, otherwise not.
* A bit of reformating
---
 css/index.gmi  |  1 -
 lib-htmgem.php | 45 +++++++++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/css/index.gmi b/css/index.gmi
index d5b4741..356dd85 100644
--- a/css/index.gmi
+++ b/css/index.gmi
@@ -43,4 +43,3 @@ Décoration de texte : **gras** //italique// __souligné__ ~~barré~~
 => mailto:adress@foo.invalid
 
 => mumble:adress.mumble.invalid
-
diff --git a/lib-htmgem.php b/lib-htmgem.php
index 96dd97c..2e872df 100644
--- a/lib-htmgem.php
+++ b/lib-htmgem.php
@@ -10,6 +10,8 @@ mb_regex_encoding("UTF-8");
  * @param str $fileContents the gemtext to parse
  */
 function gemtextParser($fileContents) {
+    if (empty($fileContents)) return array();
+    $fileContents = rtrim($fileContents); // removes last empty line
     $fileLines = explode("\n", $fileContents);
     $mode = null;
     $current = array();
@@ -30,11 +32,11 @@ function gemtextParser($fileContents) {
                 if ('^^^' == $line3) {
                     yield array("mode" => "^^^");
                 } elseif ("#" == $line1) {
-                    preg_match("/^(#{1,3})\s*(.+)/", $line, $matches);
-                    yield array("mode" => $matches[1], "title" => trim($matches[2]));
+                    preg_match("/^(#{1,3})\s*(.+)?/", $line, $matches);
+                    yield array("mode" => $matches[1], "title" => trim(@$matches[2]));
                 } elseif ("=>" == $line2) {
                     preg_match("/^=>\s*([^\s]+)(?:\s+(.*))?$/", $line, $matches);
-                    yield array("mode" => "=>", "link" => trim($matches[1]), "text" => trim(@$matches[2]));
+                    yield array("mode" => "=>", "link" => trim(@$matches[1]), "text" => trim(@$matches[2]));
                 } elseif ("```" == $line3) {
                     preg_match("/^```\s*(.*)$/", $line, $matches);
                     $current = array("mode" => "```", "alt" => trim($matches[1]), "texts" => array());
@@ -49,7 +51,7 @@ function gemtextParser($fileContents) {
                     $mode = "*";
                 } else {
                     // text_line
-                    yield array("mode"=>"", "text" => trim($line));
+                    yield array("mode"=>"", "text" => rtrim($line));
                 }
             } else {
                 if ("```"==$mode) {
@@ -58,7 +60,7 @@ function gemtextParser($fileContents) {
                         $current = array();
                         $mode = null;
                     } else {
-                        $current["texts"] []= $line; // No trim() as it’s a preformated text!
+                        $current["texts"] []= rtrim($line); // No ltrim() as it’s a preformated text!
                     }
                 } elseif (">"==$mode) {
                     if (">" == $line1) {
@@ -102,7 +104,11 @@ function gemtextParser($fileContents) {
 class GemtextTranslate_gemtext {
 
     function __construct($parsedGemtext) {
-        $this->parsedGemtext = $parsedGemtext;
+        if (empty($parsedGemtext)) $parsedGemtext = "";
+        // to delete the last empty lines
+        $parsedGemtext = rtrim($parsedGemtext);
+        // The text must be parsed
+        $this->parsedGemtext = gemtextParser($parsedGemtext);
         $this->translate();
     }
 
@@ -120,7 +126,11 @@ class GemtextTranslate_gemtext {
                     }
                     break;
                 case "```":
-                    $output .= "```\n";
+                    $alt = $node["alt"];
+                    if (empty($alt))
+                        $output .= "```\n";
+                    else
+                        $output .= "``` $alt\n";
                     foreach ($node["texts"] as $text) {
                         $output .= "$text\n";
                     }
@@ -128,13 +138,18 @@ class GemtextTranslate_gemtext {
                     break;
                 case ">":
                     foreach ($node["texts"] as $text) {
-                        $output .= "> $text\n";
+                        if (empty($text))
+                            $output .= ">\n";
+                        else
+                            $output .= "> $text\n";
                     }
                     break;
                 case "=>":
                     $linkText = $node["text"];
+                    $link = $node["link"];
                     if (!empty($linkText)) $linkText = " $linkText";
-                    $output .= "=> ".$node["link"].$linkText."\n";
+                    if (!empty($link)) $link = " $link";
+                    $output .= "=>".$link.$linkText."\n";
                     break;
                 case "#":
                 case "##":
@@ -168,13 +183,11 @@ class GemtextTranslate_html {
     public $translatedGemtext;
 
     function __construct($parsedGemtext, $textDecoration=true) {
-        if (empty($parsedGemtext))
-            $parsedGemtext = "";
-        elseif (is_string($parsedGemtext))
-            // to delete the last empty line, <p>&nbsp;</p> in HTML
-            $parsedGemtext = rtrim($parsedGemtext);
-            // The text must be parsed
-            $parsedGemtext = gemtextParser($parsedGemtext);
+        if (empty($parsedGemtext)) $parsedGemtext = "";
+        // to delete the last empty lines
+        $parsedGemtext = rtrim($parsedGemtext);
+        // The text must be parsed
+        $parsedGemtext = gemtextParser($parsedGemtext);
         $this->parsedGemtext = $parsedGemtext;
         $this->translate($textDecoration);
     }