diff makeWeb.sh @ 581:760d0ae5acea

Revise abcfield.py to recognise continuation fields. Also default to HTML entity output, and replace --contains with --starts, which does the same thing but checks only the start of the line and removes the matched item.
author Jim Hague <jim.hague@acm.org>
date Sat, 29 Oct 2016 19:32:53 +0100
parents 36d43edbd3f5
children 0206ab9fd6ba
line wrap: on
line diff
--- a/makeWeb.sh	Sun Oct 16 17:41:56 2016 +0100
+++ b/makeWeb.sh	Sat Oct 29 19:32:53 2016 +0100
@@ -105,24 +105,24 @@
         name=`basename $filename .abc`
 
         # Extract items to substitute in the web page.
-        title=`$dir/abcfield.py --field T --html $filename`
+        title=`$dir/abcfield.py --field T $filename`
         fixtitle "$title"
         title=$retval
-        subtitle=`$dir/abcfield.py --index 2 --field T --html $filename`
+        subtitle=`$dir/abcfield.py --index 2 --field T $filename`
         fixtitle "$subtitle"
         subtitle=$retval
-        composer=`$dir/abcfield.py --field C --html $filename`
-        changefile=`$dir/abcfield.py --field N --contains "Change:" $filename | sed -e "s/Change: *//"`
+        composer=`$dir/abcfield.py --field C  $filename`
+        changefile=`$dir/abcfield.py --field N --starts "Change:" $filename`
         changetitle=""
         changevisibility="no"
         if [ -n "$changefile" ]; then
-            changetitle=`$dir/abcfield.py --field T --html $bookedir/$changefile`
+            changetitle=`$dir/abcfield.py --field T $bookedir/$changefile`
             changevisibility="yes"
 
             fixtitle "$changetitle"
             changetitle=$retval
         fi
-        credit=`$dir/abcfield.py --field N --contains "Credit:" $filename | sed -e "s/Credit: *//"`
+        credit=`$dir/abcfield.py --field N --starts "Credit:" $filename`
         creditvisibility="no"
         if [ -n "$credit" ]; then
             creditvisibility="yes"