support md in TOS

3 files changed, 26 insertions, 2 deletions

diff --git a/bootstrap b/bootstrap
index a7414cd..a466ade 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,6 +5,12 @@ if ! git --version >/dev/null; then
   exit 1
 fi
 
+if ! htmlark --version >/dev/null; then
+  echo "htmlark not installed"
+  echo "Run 'pip install htmlark'"
+  exit 1
+fi
+
 echo "$0: Updating submodules"
 echo | git submodule update --init
 
diff --git a/contrib/update-pp.sh b/contrib/update-pp.sh
index db31ba1..03aa237 100755
--- a/contrib/update-pp.sh
+++ b/contrib/update-pp.sh
@@ -22,7 +22,16 @@ do
         rm -rf _build
         echo "  Generating format $f"
         make -e SPHINXOPTS="-D language='$l'" $f >>sphinx.log 2>>sphinx.err < /dev/null
-        mv _build/$f/pp.$f $l/${VERSION}.$f
+        if test $f = "html"
+        then
+            htmlark -o $l/${VERSION}.$f _build/$f/${VERSION}.$f
+        else
+            mv _build/$f/${VERSION}.$f $l/${VERSION}.$f
+        fi
+        if test $f = "txt"
+        then
+            cp $l/${VERSION}.$f $l/${VERSION}.md
+        fi
     done
 done
 cd ..
diff --git a/contrib/update-tos.sh b/contrib/update-tos.sh
index 47d3af7..26d65ed 100755
--- a/contrib/update-tos.sh
+++ b/contrib/update-tos.sh
@@ -22,7 +22,16 @@ do
         rm -rf _build
         echo "  Generating format $f"
         make -e SPHINXOPTS="-D language='$l'" $f >>sphinx.log 2>>sphinx.err < /dev/null
-        mv _build/$f/tos.$f $l/${VERSION}.$f
+        if test $f = "html"
+        then
+            htmlark -o $l/${VERSION}.$f _build/$f/${VERSION}.$f
+        else
+            mv _build/$f/${VERSION}.$f $l/${VERSION}.$f
+        fi
+        if test $f = "txt"
+        then
+            cp $l/${VERSION}.$f $l/${VERSION}.md
+        fi
     done
 done
 cd ..