Use 'id' term for jats:// test and suite ids

src/libexec/jattool-runtest

@@ -75,7 +75,7 @@ main() {
             ;;
         */*)
             TestHome=$1
-            TestId=$(jattool tfind -f jats "$TestHome") || {
+            TestId=$(jattool tfind -f id "$TestHome") || {
                 warn "could not find test id, using pathname: $TestHome"
                 TestId="jats://_jats_no_suite_/$TestHome"
             }

src/libexec/jattool-sfind

@@ -10,7 +10,7 @@ usage() {
         -- \
             "Discover test in suite located at PATH"                         \
         -o                                                                   \
-            "-f FMT     Print test name in format FMT. 'jats' or 'path'."    \
+            "-f FMT     Print test name in format FMT. 'id' or 'path'."    \
         --                                                                   \
             "Test body should consist of asserts and/or phases documented"   \
             "in jat.sh Shellfu module; use \`sfdoc jat\` to access its"    \
@@ -71,7 +71,7 @@ discover() {
             SuiteNs=$(sprop ns)
             SuiteSutPname=$(sprop sut_pname)
             case $Fmt in
-                jats)
+                id)
                     echo -n "jats://$SuiteDomain/$SuiteNs"
                     test -n "$SuiteSutPname" && echo -n "/$SuiteSutPname"
                     echo //
@@ -94,7 +94,7 @@ main() {
     esac done
     FindDirs=("$@")
     case $Fmt in
-        jats|path) : ;;
+        id|path|version) : ;;
         *) usage -w "unknown FMT: $Fmt" ;;
     esac
     debug -v FindDirs Fmt

src/libexec/jattool-tfind

@@ -10,7 +10,7 @@ usage() {
         -- \
             "Discover all JATS tests under directory PATH."                  \
         -o                                                                   \
-            "-f FMT     Print test name in format FMT. 'jats' or 'path'."
+            "-f FMT     Print test name in format FMT. 'id' or 'path'."
 }
 
 discover() {
@@ -27,11 +27,11 @@ discover() {
             s_dir=$(straverse "$t_cand") || continue
             t_apath=$(dirname "$(readlink -f "$t_cand")")
             t_rpath=${t_apath#$s_dir/}
-            s_id=$(jattool sfind -f jats "$s_dir")
+            s_id=$(jattool sfind -f id "$s_dir")
             debug -v s_dir s_id t_apath t_rpath
             case $Fmt in
                 path) echo "$s_dir/$t_rpath" ;;
-                jats) echo "$s_id$t_rpath"   ;;
+                id) echo "$s_id$t_rpath"   ;;
             esac
         done
 }
@@ -60,7 +60,7 @@ main() {
     esac done
     FindDirs=("$@")
     case $Fmt in
-        jats|path) : ;;
+        id|path) : ;;
         *) usage -w "unknown FMT: $Fmt" ;;
     esac
     debug -v FindDirs Fmt