Replace cmark-gfm and lcmark with luamark.

Plus YAR, yet another rewrite.

2 files changed, 1 insertions, 19 deletions

diff --git a/SuckItFos b/SuckItFos
index 11adaf9..1e6e48d 100755
--- a/SuckItFos
+++ b/SuckItFos
@@ -22,8 +22,6 @@ do
     mkdir -p combined/$base
     mkdir -p combined/${base}/`dirname ${file}`
     echo "Converting ${URL}/${base}/${file}?cover=print -> Foswiki/${base}/${file}.md"
-#    pandoc -f html -t markdown --self-contained ${URL}/${base}/${file} >Foswiki/${base}/${file}.md
-    # TODO - try curl, to see what is actually downloaded, and maybe not download unchanged pages.  curl to .HTM
     # Doesn't help with redownloads, coz natch a dynamic site isn't cached.  But I can at least comment out the curl command during testing to save time.
     curl --silent --no-progress-meter ${URL}/${base}/${file}?cover=print -o Foswiki/${base}/${file}.HTM
     cp Foswiki/${base}/${file}.HTM Foswiki/${base}/${file}.HTM_ORIGINAL
@@ -40,13 +38,10 @@ do
         -e 's/class="foswikiTopic"/class="FoswikiTopic"/g' \
         -e 's/class="foswiki[[:alpha:]]*"//g' \
         -e "s/style='.*;'//g"
-#       -e "s/style='background-color: #.*;'//g" \
-#       -e "s/style='font-size: .*;'//g"
 
     pandoc -f html -t commonmark_x --self-contained Foswiki//${base}/${file}.HTM >Foswiki/${base}/${file}.md
     cp Foswiki/${base}/${file}.md Foswiki/${base}/${file}.md_ORIGINAL
 
-#    csplit -ks Foswiki/${base}/${file}.md '%::: {.foswikiTopic}%' '/::: {.foswikiContentFooter}/'
     csplit -ks Foswiki/${base}/${file}.md '%::: {.FoswikiTopic}%' '/::: {.patternInfo}/'
     if [ -f xx00 ]; then
         rm Foswiki/${base}/${file}.md
@@ -63,10 +58,6 @@ do
 #       -e 's/\{\.pattern.*//g' \
 
     echo -e "****\n[Original page](${URL}/${base}/${file}) where maybe you can edit it." >> Foswiki/${base}/${file}.md
-
-#    pandoc -t html -f commonmark_x --self-contained            Foswiki/${base}/${file}.md > Foswiki/${base}/${file}.htm
-#    cmark-gfm -t html -e footnotes -e table -e strikethrough   Foswiki/${base}/${file}.md > Foswiki/${base}/${file}.body
-#    ln -frs Foswiki/${base}/${file}.body combined/${base}/${file}.body
     ln -frs Foswiki/${base}/${file}.md combined/${base}/${file}.md
 
     if [ -f xx01 ]; then
diff --git a/SuckItPm b/SuckItPm
index a7c1321..fe7efb3 100755
--- a/SuckItPm
+++ b/SuckItPm
@@ -17,12 +17,9 @@ find /opt/pmwiki/wiki.d  ${filter} \
 do
     base=`echo "${line}" | cut -d '.' -f 1`
     file=`echo "${line}" | cut -d '.' -f 2`
-#    page="?n=${line}"
     mkdir -p PmWiki/$base
     mkdir -p combined/$base
     echo "Converting ${URL}/?n=${base}.${file}?action=print -> PmWiki/${base}/${file}.md"
-#    pandoc -f html -t markdown --self-contained ${URL}/?n=${base}.${file} >PmWiki/${base}/${file}.md
-    # TODO - try curl, to see what is actually downloaded, and maybe not download unchanged pages.  curl to .HTM
     # Doesn't help with redownloads, coz natch a dynamic site isn't cached.  But I can at least comment out the curl command during testing to save time.
 #    curl --no-progress-meter ${URL}/?n=${base}.${file}?action=markdown -o PmWiki/${base}/${file}.MD
     curl --no-progress-meter ${URL}/?n=${base}.${file}?action=print -o PmWiki/${base}/${file}.HTM
@@ -45,11 +42,9 @@ do
         -e "s/class='vspace'//g" \
         -e "s/class='wikilink'//g" \
         -e "s/style='.*;'//g"
-#       -e "s/style='background-color: #.*;'//g" \
-#       -e "s/style='font-size: .*;'//g"
 
-    pandoc -f html -t commonmark_x --self-contained PmWiki//${base}/${file}.HTM >PmWiki/${base}/${file}.md
 #    pandoc -f markdown -t commonmark_x --self-contained PmWiki//${base}/${file}.MD >PmWiki/${base}/${file}.md
+    pandoc -f html -t commonmark_x --self-contained PmWiki//${base}/${file}.HTM >PmWiki/${base}/${file}.md
     cp PmWiki/${base}/${file}.md PmWiki/${base}/${file}.md_ORIGINAL
 
     # Attempt to clean things up, badly.
@@ -68,10 +63,6 @@ do
 
     # Don't need this, the parts we are grabbing already include that link at the bottom.
 #    echo -e "****\n[Original page](${URL}/${base}/${page}) where maybe you can edit it." >> PmWiki/${base}/${file}.md
-
-#    pandoc -t html -f commonmark_x --self-contained            PmWiki/${base}/${file}.md > PmWiki/${base}/${file}.htm
-#    cmark-gfm -t html -e footnotes -e table -e strikethrough   PmWiki/${base}/${file}.md > PmWiki/${base}/${file}.body
-#    ln -frs PmWiki/${base}/${file}.body combined/${base}/${file}.body
     ln -frs PmWiki/${base}/${file}.md combined/${base}/${file}.md
 
     if [ -f xx01 ]; then