Merge branch 'master' of tilde.institute:public_repos/gmi2html HEAD master

2 files changed, 9 insertions, 9 deletions

diff --git a/gmi2html.awk b/gmi2html.awk
index 0193e6e..cba6c20 100755
--- a/gmi2html.awk
+++ b/gmi2html.awk
@@ -21,12 +21,12 @@
 #   $ awk -f gmi2html.awk \
 #       -v title=<title> \
 #       -v css=<css> \
-#       -v url=<url> < path/to/gmi > path/to/html
+#       -v original=<original> < path/to/gmi > path/to/html
 #
 # parameters:
 #   <title>: the title of the document, used in the HTML <title>
 #   <css>: relative path to a CSS stylesheet
-#   <url>: URL of the original Gemini document, linked in the footer
+#   <original>: URL of the original Gemini document, linked in the footer
 
 # Begin HTML document
 BEGIN {
@@ -119,7 +119,7 @@ BEGIN {
 /^&gt;/ {
     sub(/^&gt;[ \t]*/, "")
 
-    printf "<blockquote><p>&ldquo;%s&rdquo;</p></blockquote>", $0
+    printf "<blockquote>%s</blockquote>", $0
     next
 }
 
@@ -147,7 +147,7 @@ BEGIN {
         text = url
     }
 
-    printf "<p><code>=&gt;</code> <a href=\"%s\">%s</a></p>", url, text
+    printf "<p><a href=\"%s\">%s</a></p>", url, text
     next
 }
 
@@ -174,5 +174,5 @@ Also available on <a href=\"gemini://%s\">Gemini</a>\
 </small>\
 </footer>\
 </body>\
-</html>", url
+</html>", original
 }
diff --git a/gmi2htmldir.sh b/gmi2htmldir.sh
index 67b8c3c..6359dd0 100755
--- a/gmi2htmldir.sh
+++ b/gmi2htmldir.sh
@@ -18,19 +18,19 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # usage:
-#   $ ./gmi2htmldir.sh <in> <out> title=<title> css=<css> url=<url>
+#   $ ./gmi2htmldir.sh <in> <out> title=<title> css=<css> original=<original>
 #
 # parameters:
 #   <in>: the folder of Gemini files to be converted
 #   <out>: the folder in which to put the generated HTML files
-#   <title>, <css>, <url>: parameters passed to gmi2html.awk; see gmi2html.awk for more details
+#   <title>, <css>, <original>: parameters passed to gmi2html.awk; see gmi2html.awk for more details
 #
 
 in=$1
 out=$2
 title=$3
 css=$4
-url=$5
+original=$5
 
 # Get the path of the gmi2html.awk script, which is in the
 # same directory as this one.
@@ -50,7 +50,7 @@ for f in *.gmi **/*.gmi; do
   echo "processing: ${f} -> ${HTML_FILENAME}"
 
   # Run the gmi2html.awk script, passing in the parameters
-  awk -f $gmi2html -v $title -v $css -v $url \
+  awk -f $gmi2html -v $title -v $css -v $original \
     < $f \
     > $HTML_FILENAME
 done