diff --git a/docs/icon.pandoc b/docs/icon.pandoc new file mode 100644 index 0000000..141fc0c --- /dev/null +++ b/docs/icon.pandoc @@ -0,0 +1 @@ + diff --git a/docs/pandoc_templates/icon.pandoc b/docs/libraries/icon.pandoc similarity index 100% rename from docs/pandoc_templates/icon.pandoc rename to docs/libraries/icon.pandoc diff --git a/docs/mkdocs.sh b/docs/mkdocs.sh index f393ad4..170015d 100644 --- a/docs/mkdocs.sh +++ b/docs/mkdocs.sh @@ -11,8 +11,9 @@ elif [[ "$OSTYPE" == "cygwin" ]]; then elif [[ "$OSTYPE" == "msys" ]]; then osoptions="--fail-if-warnings --eol=lf " fi -templates="./pandoc_templates" -options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=$templates/icon.pandoc --include-before-body=$templates/before.pandoc --css=$templates/style.css -o" +templates=$(pwd)"/pandoc_templates" +options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=icon.pandoc --include-before-body=$templates/before.pandoc --css=$templates/style.css -o" +pwd for f in *.md do len=${#f} @@ -41,8 +42,8 @@ if [[ $line =~ notmine$ ]]; fi done cd libraries -templates="../pandoc_templates" -options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=$templates/icondotdot.pandoc --include-before-body=$templates/beforedotdot.pandoc --css=$templates/style.css --include-after-body=$templates/after.pandoc -o" +options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=./icon.pandoc --include-before-body=$templates/before.pandoc --css=$templates/style.css --include-after-body=$templates/after.pandoc -o" +pwd for f in *.md do len=${#f} @@ -66,8 +67,8 @@ do done cd .. cd names -templates="../pandoc_templates" -options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=$templates/icondotdot.pandoc --include-before-body=$templates/beforedotdot.pandoc --css=$templates/style.css --include-after-body=$templates/after.pandoc -o" +options=$osoptions"--toc -N --toc-depth=5 --wrap=preserve --metadata=lang:en --include-in-header=./icon.pandoc --include-before-body=$templates/before.pandoc --css=$templates/style.css --include-after-body=$templates/after.pandoc -o" +pwd for f in *.md do len=${#f} @@ -91,7 +92,8 @@ do done cd .. cd rootDocs -templates="../pandoc_templates" +pwd +katex="" for f in *.md do len=${#f} @@ -99,7 +101,7 @@ do if [ $f -nt ../../$base.html ]; then echo "generating $base.html from $f" - pandoc $osoptions --wrap=preserve --from markdown --to html --metadata=lang:en --css=$templates/style.css --self-contained -o ../../$base.html $base.md + pandoc $katex $options ../../$base.html $base.md #--include-in-header=style.css #else # echo " $base.html up to date" diff --git a/docs/names/icon.pandoc b/docs/names/icon.pandoc new file mode 100644 index 0000000..f43d0b9 --- /dev/null +++ b/docs/names/icon.pandoc @@ -0,0 +1 @@ + diff --git a/docs/pandoc_templates/beforedotdot.pandoc b/docs/pandoc_templates/beforedotdot.pandoc deleted file mode 100644 index 3509826..0000000 --- a/docs/pandoc_templates/beforedotdot.pandoc +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/docs/pandoc_templates/icondotdot.pandoc b/docs/pandoc_templates/icondotdot.pandoc deleted file mode 100644 index 85695be..0000000 --- a/docs/pandoc_templates/icondotdot.pandoc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docs/rootDocs/icon.pandoc b/docs/rootDocs/icon.pandoc new file mode 100644 index 0000000..cb3cce0 --- /dev/null +++ b/docs/rootDocs/icon.pandoc @@ -0,0 +1 @@ + diff --git a/mpir b/mpir index 20795fa..c7f9435 160000 --- a/mpir +++ b/mpir @@ -1 +1 @@ -Subproject commit 20795fa90044ea9adfc5a2e28c9a60d8e2eebcbd +Subproject commit c7f9435392ede4c7f2c887a44d7a9ca7d724f4dc diff --git a/wxWidgets b/wxWidgets index 3a3654c..8880bc8 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit 3a3654c27f3110b7ca8887b424417b6d26e2682e +Subproject commit 8880bc88ff6c2cfcd72c3fcd3ef532b5470b2103