From 07e6191f9cd7cebeea23392aeccdfb51d9b3f07c Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Sat, 29 Oct 2016 21:51:59 +0100 Subject: [PATCH] Switch from txt2tags to using pandoc with Markdown (Pandoc flavour) input. --- Library/{intro.txt => intro.md} | 3 --- Morris/{intro.txt => intro.md} | 3 --- Session/{intro.txt => intro.md} | 3 --- makeBooke.sh | 4 ++-- makeWeb.sh | 4 ++-- 5 files changed, 4 insertions(+), 13 deletions(-) rename Library/{intro.txt => intro.md} (71%) rename Morris/{intro.txt => intro.md} (74%) rename Session/{intro.txt => intro.md} (85%) diff --git a/Library/intro.txt b/Library/intro.md similarity index 71% rename from Library/intro.txt rename to Library/intro.md index 906e0eb..7d710ee 100644 --- a/Library/intro.txt +++ b/Library/intro.md @@ -1,6 +1,3 @@ -This is a txt2tags input file. -The first 3 lines are headers, and are ignored. - This book is for tunes that are not part of the regular Havoc session or dance repertoire. diff --git a/Morris/intro.txt b/Morris/intro.md similarity index 74% rename from Morris/intro.txt rename to Morris/intro.md index 832aa80..de3592e 100644 --- a/Morris/intro.txt +++ b/Morris/intro.md @@ -1,6 +1,3 @@ -This is a txt2tags input file. -The first 3 lines are headers, and are ignored. - This book provides the dots for the music to all the dances performed by Cry Havoc. The name of the dance is given as the tune title. If the name of the tune differs from the name of the dance, the tune diff --git a/Session/intro.txt b/Session/intro.md similarity index 85% rename from Session/intro.txt rename to Session/intro.md index a594dca..c07c68e 100644 --- a/Session/intro.txt +++ b/Session/intro.md @@ -1,6 +1,3 @@ -This is a txt2tags input file. -The first 3 lines are headers, and are ignored. - This book provides the dots for the tunes commonly played at Cry Havoc music sessions. diff --git a/makeBooke.sh b/makeBooke.sh index 2dcb9b7..07570bc 100755 --- a/makeBooke.sh +++ b/makeBooke.sh @@ -37,8 +37,8 @@ done for item in intro do rm -f $builddir/$item.tex - if [ -r $booke/$item.txt ]; then - txt2tags --no-headers --target=tex --outfile=$builddir/$item.tex $booke/$item.txt + if [ -r $booke/$item.md ]; then + pandoc --from=markdown --to=latex --output=$builddir/$item.tex $booke/$item.md else touch $builddir/$item.tex fi diff --git a/makeWeb.sh b/makeWeb.sh index 46f4ae9..3d6aa92 100755 --- a/makeWeb.sh +++ b/makeWeb.sh @@ -86,8 +86,8 @@ sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \ for item in intro do rm -f $webdir/$item.html - if [ -r $booke/$item.txt ]; then - txt2tags --no-headers --target=html --outfile=$webdir/$item.html $booke/$item.txt + if [ -r $booke/$item.md ]; then + pandoc --from=markdown --to=html --output=$webdir/$item.html $booke/$item.md else touch $webdir/$item.html fi