From 1079f927a27db9d194c8e25eb3a188396fdf8eab Mon Sep 17 00:00:00 2001
From: Paul Buetow <git@mx.buetow.org>
Date: Mon, 17 May 2021 21:02:55 +0100
Subject: refactor code

---
 packages/html.source.sh | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 packages/html.source.sh

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
new file mode 100644
index 0000000..d8d2fc6
--- /dev/null
+++ b/packages/html.source.sh
@@ -0,0 +1,145 @@
+html::special () {
+    $SED '
+        s|\&|\&amp;|g;
+        s|<|\&lt;|g;
+        s|>|\&gt;|g;
+    ' <<< "$@"
+}
+
+html::make_paragraph () {
+    local -r text="$1"; shift
+    test -n "$text" && echo "<p>$(html::special "$text")</p>"
+}
+
+html::make_heading () {
+    local -r text=$($SED -E 's/^#+ //' <<< "$1"); shift
+    local -r level="$1"; shift
+    echo "<h${level}>$(html::special "$text")</h${level}>"
+}
+
+html::make_quote () {
+    local -r quote="${1/> }"
+    echo "<p class=\"quote\"><i>$(html::special "$quote")</i></p>"
+}
+
+html::make_img () {
+    local link="$1"; shift
+    local descr="$1"; shift
+
+    if [ -z "$descr" ]; then
+        echo -n "<a href=\"$link\"><img src=\"$link\" /></a>"
+    else
+        echo -n "<i>$descr:</i>"
+        echo -n "<a href=\"$link\"><img alt=\"$descr\" title=\"$descr\" src=\"$link\" /></a>"
+    fi
+
+    echo "<br />"
+}
+
+html::make_link () {
+    local link="$1"; shift
+    local descr="$1"; shift
+
+    grep -F -q '://' <<< "$link" || link=${link/.gmi/.html}
+    test -z "$descr" && descr="$link"
+    echo "<a class=\"textlink\" href=\"$link\">$descr</a><br />"
+}
+
+html::fromgmi () {
+    local is_list=no
+    local is_plain=no
+
+    while IFS='' read -r line; do
+        if [[ "$is_list" == yes ]]; then
+            if [[ "$line" == '* '* ]]; then
+                echo "<li>$(html::special "${line/\* /}")</li>"
+            else
+                is_list=no
+                echo "</ul>"
+            fi
+            continue
+
+        elif [[ "$is_plain" == yes ]]; then
+            if [[ "$line" == '```'* ]]; then
+                echo "</pre>"
+                is_plain=no
+            else
+                html::special "$line"
+            fi
+            continue
+        fi
+
+        case "$line" in
+            '* '*)
+                is_list=yes
+                echo "<ul>"
+                echo "<li>${line/\* /}</li>"
+                ;;
+            '```'*)
+                is_plain=yes
+                echo "<pre>"
+                ;;
+            '# '*)
+                html::make_heading "$line" 1
+                ;;
+            '## '*)
+                html::make_heading "$line" 2
+                ;;
+            '### '*)
+                html::make_heading "$line" 3
+                ;;
+            '> '*)
+                html::make_quote "$line"
+                ;;
+            '=> '*)
+                generate::make_link html "$line"
+                ;;
+            *)
+                html::make_paragraph "$line"
+                ;;
+        esac
+    done
+}
+
+html::test () {
+    local line='Hello world! This is a paragraph.'
+    assert::equals "$(html::make_paragraph "$line")" '<p>Hello world! This is a paragraph.</p>'
+
+    line=''
+    assert::equals "$(html::make_paragraph "$line")" ''
+
+    line='Foo &<>& Bar!'
+    assert::equals "$(html::make_paragraph "$line")" '<p>Foo &amp;&lt;&gt;&amp; Bar!</p>'
+
+    line='# Header 1'
+    assert::equals "$(html::make_heading "$line" 1)" '<h1>Header 1</h1>'
+
+    line='## Header 2'
+    assert::equals "$(html::make_heading "$line" 2)" '<h2>Header 2</h2>'
+
+    line='### Header 3'
+    assert::equals "$(html::make_heading "$line" 3)" '<h3>Header 3</h3>'
+
+    line='> This is a quote'
+    assert::equals "$(html::make_quote "$line")" '<p class="quote"><i>This is a quote</i></p>'
+
+    line='=> https://example.org'
+    assert::equals "$(generate::make_link html "$line")" \
+        '<a class="textlink" href="https://example.org">https://example.org</a><br />'
+
+    line='=> index.gmi'
+    assert::equals "$(generate::make_link html "$line")" \
+        '<a class="textlink" href="index.html">index.html</a><br />'
+
+    line='=> http://example.org Description of the link'
+    assert::equals "$(generate::make_link html "$line")" \
+        '<a class="textlink" href="http://example.org">Description of the link</a><br />'
+
+    line='=> http://example.org/image.png'
+    assert::equals "$(generate::make_link html "$line")" \
+        '<a href="http://example.org/image.png"><img src="http://example.org/image.png" /></a><br />'
+
+    line='=> http://example.org/image.png Image description'
+    assert::equals "$(generate::make_link html "$line")" \
+        '<i>Image description:</i><a href="http://example.org/image.png"><img alt="Image description" title="Image description" src="http://example.org/image.png" /></a><br />'
+}
-- 
cgit v1.2.3


From f6deb276c7c5e7b3617d9ecd35193b43ae32ccbf Mon Sep 17 00:00:00 2001
From: Paul Buetow <git@mx.buetow.org>
Date: Mon, 17 May 2021 21:19:35 +0100
Subject: refactor

---
 packages/html.source.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index d8d2fc6..d295c7a 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -1,4 +1,5 @@
-html::special () {
+# Convert special characters to their HTML codes
+html::encode () {
     $SED '
         s|\&|\&amp;|g;
         s|<|\&lt;|g;
@@ -6,22 +7,26 @@ html::special () {
     ' <<< "$@"
 }
 
+# Make a HTML paragraph.
 html::make_paragraph () {
     local -r text="$1"; shift
-    test -n "$text" && echo "<p>$(html::special "$text")</p>"
+    test -n "$text" && echo "<p>$(html::encode "$text")</p>"
 }
 
+# Make a HTML header.
 html::make_heading () {
     local -r text=$($SED -E 's/^#+ //' <<< "$1"); shift
     local -r level="$1"; shift
-    echo "<h${level}>$(html::special "$text")</h${level}>"
+    echo "<h${level}>$(html::encode "$text")</h${level}>"
 }
 
+# Make a HTML quotation
 html::make_quote () {
     local -r quote="${1/> }"
-    echo "<p class=\"quote\"><i>$(html::special "$quote")</i></p>"
+    echo "<p class=\"quote\"><i>$(html::encode "$quote")</i></p>"
 }
 
+# Make a HTML image
 html::make_img () {
     local link="$1"; shift
     local descr="$1"; shift
@@ -36,6 +41,7 @@ html::make_img () {
     echo "<br />"
 }
 
+# Make a HTML hyperlink
 html::make_link () {
     local link="$1"; shift
     local descr="$1"; shift
@@ -45,6 +51,7 @@ html::make_link () {
     echo "<a class=\"textlink\" href=\"$link\">$descr</a><br />"
 }
 
+## Convert Gemtext to HTML
 html::fromgmi () {
     local is_list=no
     local is_plain=no
@@ -52,7 +59,7 @@ html::fromgmi () {
     while IFS='' read -r line; do
         if [[ "$is_list" == yes ]]; then
             if [[ "$line" == '* '* ]]; then
-                echo "<li>$(html::special "${line/\* /}")</li>"
+                echo "<li>$(html::encode "${line/\* /}")</li>"
             else
                 is_list=no
                 echo "</ul>"
@@ -64,7 +71,7 @@ html::fromgmi () {
                 echo "</pre>"
                 is_plain=no
             else
-                html::special "$line"
+                html::encode "$line"
             fi
             continue
         fi
@@ -101,6 +108,7 @@ html::fromgmi () {
     done
 }
 
+## Test HTML package.
 html::test () {
     local line='Hello world! This is a paragraph.'
     assert::equals "$(html::make_paragraph "$line")" '<p>Hello world! This is a paragraph.</p>'
-- 
cgit v1.2.3


From 6aee04354e443e2121bf6c558be227388a10e7b2 Mon Sep 17 00:00:00 2001
From: Paul Buetow <git@mx.buetow.org>
Date: Mon, 17 May 2021 21:23:06 +0100
Subject: reword comments

---
 packages/html.source.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index d295c7a..cc79e61 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -51,7 +51,7 @@ html::make_link () {
     echo "<a class=\"textlink\" href=\"$link\">$descr</a><br />"
 }
 
-## Convert Gemtext to HTML
+# Convert Gemtext to HTML
 html::fromgmi () {
     local is_list=no
     local is_plain=no
@@ -108,7 +108,7 @@ html::fromgmi () {
     done
 }
 
-## Test HTML package.
+# Test HTML package.
 html::test () {
     local line='Hello world! This is a paragraph.'
     assert::equals "$(html::make_paragraph "$line")" '<p>Hello world! This is a paragraph.</p>'
-- 
cgit v1.2.3


From 641a95de7bdd64963666cca6b96387ab5d9245e2 Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Wed, 19 May 2021 10:06:02 +0100
Subject: some refactoring and also ensured that it works on macOS (given Bash
 5 is installed)

---
 packages/html.source.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index cc79e61..5a292f1 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -46,7 +46,7 @@ html::make_link () {
     local link="$1"; shift
     local descr="$1"; shift
 
-    grep -F -q '://' <<< "$link" || link=${link/.gmi/.html}
+    $GREP -F -q '://' <<< "$link" || link=${link/.gmi/.html}
     test -z "$descr" && descr="$link"
     echo "<a class=\"textlink\" href=\"$link\">$descr</a><br />"
 }
-- 
cgit v1.2.3


From 65f8a2497bad58619d0cfdc76e4a0efeb15e0306 Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Thu, 20 May 2021 17:51:07 +0100
Subject: initial macos support

---
 packages/html.source.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index 5a292f1..a258781 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -10,7 +10,10 @@ html::encode () {
 # Make a HTML paragraph.
 html::make_paragraph () {
     local -r text="$1"; shift
-    test -n "$text" && echo "<p>$(html::encode "$text")</p>"
+
+    if [[ -n "$text" ]]; then
+        echo "<p>$(html::encode "$text")</p>"
+    fi
 }
 
 # Make a HTML header.
@@ -46,8 +49,13 @@ html::make_link () {
     local link="$1"; shift
     local descr="$1"; shift
 
-    $GREP -F -q '://' <<< "$link" || link=${link/.gmi/.html}
-    test -z "$descr" && descr="$link"
+    if $GREP -F -q '://' <<< "$link"; then
+        link=${link/.gmi/.html}
+    fi
+    if [[ -z "$descr" ]]; then
+        descr="$link"
+    fi
+
     echo "<a class=\"textlink\" href=\"$link\">$descr</a><br />"
 }
 
-- 
cgit v1.2.3


From 5eba1760c0db9b01f7498a1efbfb4d969b6f3051 Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Thu, 20 May 2021 18:08:36 +0100
Subject: works now on macOS

---
 packages/html.source.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index a258781..efb9bf6 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -143,7 +143,7 @@ html::test () {
     assert::equals "$(generate::make_link html "$line")" \
         '<a class="textlink" href="https://example.org">https://example.org</a><br />'
 
-    line='=> index.gmi'
+    line='=> index.html'
     assert::equals "$(generate::make_link html "$line")" \
         '<a class="textlink" href="index.html">index.html</a><br />'
 
-- 
cgit v1.2.3


From bd1adc6f9e2b22b5ea887519c4cc73cc08e36328 Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Thu, 20 May 2021 18:16:51 +0100
Subject: fix macOS links

---
 packages/html.source.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/html.source.sh')

diff --git a/packages/html.source.sh b/packages/html.source.sh
index efb9bf6..6049c2f 100644
--- a/packages/html.source.sh
+++ b/packages/html.source.sh
@@ -49,9 +49,10 @@ html::make_link () {
     local link="$1"; shift
     local descr="$1"; shift
 
-    if $GREP -F -q '://' <<< "$link"; then
+    if ! $GREP -F -q '://' <<< "$link"; then
         link=${link/.gmi/.html}
     fi
+
     if [[ -z "$descr" ]]; then
         descr="$link"
     fi
-- 
cgit v1.2.3