From a0cdb1e3653c4b55aa5251970399d40ffd736c72 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Mon, 30 Aug 2010 20:16:34 -0300 Subject: [PATCH] Fixed some smaller bugs and slightly improved formatting of commit entries. - scripts/schhist2web: when starting, remove html_* and pdf_* - scripts/schps2pdf: corrected quoting of sheet title derived from file name (produced many error messages and caused garbled titles in the overall schematics) - scripts/schhist2web: indent date in commit entry such that it's flush with the author --- scripts/schhist2web | 4 ++-- scripts/schps2pdf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/schhist2web b/scripts/schhist2web index 88a7bef..dad196b 100755 --- a/scripts/schhist2web +++ b/scripts/schhist2web @@ -65,7 +65,7 @@ commit_entry() EOF echo "
"
     ( cd "$dir" && git show \
-        --pretty=format:"%aN <%aE>%n%ad, %ar%n%n    %s" \
+        --pretty=format:"%aN <%aE>%n    %ad, %ar%n%n    %s" \
 	--quiet $next; ) |
       sed 's/&/&/g;s//\>/g' |
       if [ -z "$SCHHIST_COMMIT_TEMPLATE" ]; then
@@ -171,7 +171,7 @@ PATH=`dirname "$0"`:"$PATH"
 first=`gitenealogy "$dir" "$sch" | sed '$s/ .*//p;d'`
 schname=`gitenealogy "$dir" "$sch" | sed '$s/^.* //p;d'`
 
-rm -rf "$out/diff_*" "$out/thumb_*" "$out/names"
+rm -rf "$out/diff_*" "$out/thumb_*" "$out/html_*" "$out/pdf_*" "$out/names"
 $no_cache && rm -rf "$cache"
 mkdir -p "$out/names"
 mkdir -p "$cache"
diff --git a/scripts/schps2pdf b/scripts/schps2pdf
index 10650f1..eff40d1 100755
--- a/scripts/schps2pdf
+++ b/scripts/schps2pdf
@@ -53,7 +53,7 @@ shift
 eval gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=\""$out\"" -f \
   `export i=1; for n in "$in" "$@"; do \
     i=\`expr $i + 1\`;
-    echo "<(sheet=\`basename \"$n\" .ps\`;
+    echo "<(sheet=\"\`basename \"$n\" .ps\`\";
     set x $titles; i=\`expr $i + 1\`; eval t='\\$$i';
       $toc && echo '[ /Title ('\"\\${t:-\\${sheet#$prefix}}\"') /OUT pdfmark';
     cat \"$n\";)"; done`