From cf1074cd1d712cc63d5c07411757acd931a1f6a2 Mon Sep 17 00:00:00 2001 From: eudoxia Date: Sat, 26 Dec 2020 03:15:31 -0500 Subject: md.sh: toc line position determined from md-header line count; other misc improvements --- md-header | 12 ++++++------ md.sh | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/md-header b/md-header index 34062e7..a7b11d0 100755 --- a/md-header +++ b/md-header @@ -10,20 +10,20 @@ -# - + + +
-
#
+
-
––––DistressNetwork°
+
––––DistressNetwork°
-
#
+
- diff --git a/md.sh b/md.sh index 8ba076f..18683d3 100755 --- a/md.sh +++ b/md.sh @@ -61,25 +61,25 @@ decode() { TITLE=$(grep -e '^title: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s/#/<title>${TITLE} \&mdash\; DistressNetwork°/1" -i'' $OUT +sed "s/<title>/&${TITLE} \&mdash\; DistressNetwork°/1" -i'' $OUT printf "[ok] \ttitle: %s\n" "$(echo "$TITLE" | unesc)" BOMBER=$(grep -e '^bomber: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s/<div class=\"bomber\">#/<div class=\"bomber\">${BOMBER}/1" -i'' $OUT +sed "s/<div class=\"bomber\">/&${BOMBER}/1" -i'' $OUT printf "[ok] \tbomber: %s\n" "$(echo "$BOMBER" | unesc)" MDATE=$(stat -c '%y' $IN | sed -e 's/\.[0-9]* //' -e 's/\(..\)\(..\)$/\1:\2/') # format: "yyyy-mm-dd hh:mm:ss±zz:zz" (ISO 8601) DATE=$(echo $MDATE | cut -f 1 -d ' ' | sed -e 's/-//g' -e 's/^..//') # format: "yymmdd" (for humans) -sed "s;<div class=\"ident\"><time>#;<div class=\"ident\"><time datetime=\"${MDATE}\">${DATE};1" -i'' $OUT -sed "/^<\/head>/i <meta http-equiv=\"last-modified\" content=\"${MDATE}\" />" -i'' $OUT +sed -e "s;<div class=\"ident\"><time datetime=\";&${MDATE};1" -e "s;</time>;${DATE}&;1" -i'' $OUT +sed "s;<meta http-equiv=\"last-modified\" content=\";&${MDATE};1" -i'' $OUT printf "[ok] \tdate: %s (%s)\n" "$DATE" "$MDATE" LEADING=$(grep -e '^leading: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s;<div class=\"leading\">#;<div class=\"leading\">${LEADING};1" -i'' $OUT +sed "s;<div class=\"leading\">;&${LEADING};1" -i'' $OUT printf "[ok] \tleading: %s\n" "$(echo "$LEADING" | unesc)" METADESC="\«\;${BOMBER}\»\; \&mdash\; ${LEADING}" -sed "s;<meta name=\"description\" content=\"#;<meta name=\"description\" content=\"${METADESC};1" -i'' $OUT +sed "s;<meta name=\"description\" content=\";&${METADESC};1" -i'' $OUT printf "[ok] \tmeta description\n" if [ -f $(echo $IN | cut -f 1 -d /)/nav.html ] ; then @@ -148,7 +148,7 @@ echo '</nav>' >> $tmp # get toc line number in output, insert data from tempfile -TOCLINE=$(grep -n '<!-- end of header -->' $OUT | cut -f 1 -d :) +TOCLINE=$(wc -l md-header | cut -f 1 -d ' ') sed "${TOCLINE}r $tmp" -i'' $OUT rm $tmp # cleanup -- cgit v1.2.3