bin: generalized shorthands for ltldo and ltlcross

* src/bin/common_trans.cc: Skip leading directories, and
do not require that the prefix is followed by space of 0.
* src/tests/ltldo.test: Add a test.
* doc/org/ltlcross.org: Update.

doc/org/ltlcross.org

@@ -180,6 +180,12 @@ the following words, then the string on the right is appended.
   ltl3dra      -f %f>%O
   modella      %L %O
   spin         -f %s>%O
+
+Any {name} and directory component is skipped for the purpose of
+matching those prefixes.  So for instance
+  '{DRA} ~/mytools/ltl2dstar-0.5.2'
+will changed into
+  '{DRA} ~/mytools/ltl2dstar-0.5.2 --output-format=hoa %L %O'
 #+end_example
 
 What this implies is that running =ltlcross ltl2ba ltl3ba ...= is

src/bin/common_trans.cc

@@ -58,6 +58,12 @@ void show_shorthands()
     std::cout << "  "
 	      << std::left << std::setw(12) << s.prefix
 	      << s.suffix << '\n';
+  std::cout
+    << ("\nAny {name} and directory component is skipped for the purpose of\n"
+	"matching those prefixes.  So for instance\n"
+	"  '{DRA} ~/mytools/ltl2dstar-0.5.2'\n"
+	"will changed into\n"
+	"  '{DRA} ~/mytools/ltl2dstar-0.5.2 --output-format=hoa %L %O'\n");
 }
 
 
@@ -84,15 +90,28 @@ translator_spec::translator_spec(const char* spec)
 	      }
 	}
     }
-  // If we recognize a shorthand, add the suffixes.
+  // If there is no % in the string, look for a known
+  // command from our shorthand list.  If we find it,
+  // add the suffix.
   bool allocated = false;
   if (!strchr(cmd, '%'))
     {
+      // Skip any leading directory name.
+      auto basename = cmd;
+      auto pos = cmd;
+      while (*pos)
+	{
+	  if (*pos == '/')
+	    basename = pos + 1;
+	  else if (*pos == ' ')
+	    break;
+	  ++pos;
+	}
+      // Match a shorthand.
       for (auto& p: shorthands)
 	{
 	  int n = strlen(p.prefix);
-	  if (strncmp(cmd, p.prefix, n) == 0 &&
+	  if (strncmp(basename, p.prefix, n) == 0)
-	      (cmd[n] == 0 || cmd[n] == ' '))
 	    {
 	      int m = strlen(p.suffix);
 	      int q = strlen(cmd);

src/tests/ltldo.test

@@ -110,3 +110,6 @@ $ltldo ': %s; true>%O' -f GFa 2>stderr && exit 1
 test $? = 2
 grep 'error: command ".*" produced an empty output.' stderr
 grep 'ltldo: aborting' stderr
+
+$ltldo '{name} foo/bar/ltl2baextended' -f GFa 2>stderr && exit 1
+grep 'error:.*foo/bar/ltl2baextended -f .*>.*' stderr