When a label has a digit in it dellivelink.py notices

and prints a warning. And for that instance, does not convert
to the new form.
Because digits are not allowed in command names.
The remaining instances should be fixed in the .tex.

diff --git a/dwarf5/tools/dellivelink.py b/dwarf5/tools/dellivelink.py
index e786d69..5381915 100644 (file)
--- a/dwarf5/tools/dellivelink.py
+++ b/dwarf5/tools/dellivelink.py
@@ -22,6 +22,11 @@ def ischar(tok,c):
        return "n"
    return "y"
 
+def tokhasdigits(tok):
+  for c in tok._label:
+    if c >= '0' and c <= '9' and len(c) == 1:
+        return "y"
+  return "n"
 
 def append_to_out(out,addthese):
   for a in addthese:
@@ -48,6 +53,9 @@ def doreplace(toks,curtoknum,lasttoknum):
     return "n"
   if toks[curtoknum+6]._class != "ind" or myjoinlabel(toks[curtoknum+6]) != "}":
     return "n"
+  if tokhasdigits(toks[curtoknum+5]) == "y":
+    print "There are digits in ", myjoinlabel(toks[curtoknum+5]),": it is not converted"
+    return "n"
   return "y"
 
 

diff --git a/dwarf5/tools/dellivelink.tex b/dwarf5/tools/dellivelink.tex
index 94c1ef0..d359d83 100644 (file)
--- a/dwarf5/tools/dellivelink.tex
+++ b/dwarf5/tools/dellivelink.tex
@@ -27,7 +27,7 @@ zed \livelink{chap:anything}{any\_thing\_plus}
 
 \begin{alltt}
 
-one \livelink{chap:DWOPplus}{DW\_OP\_plus} one
+one \livelink{chap:DWOPplus}{DW\_OP\_plus} one \livelink{chap:DWOPplus}{DW\_OP\_plus}
 one \livelink{chap:DWOPplus}{DW\_OP\_plus}two
 one \livelink{chap:DWOPplus}{DW\_OP\_plus}+ 3
 one \livelink{chap:DWOPplus}{DW\_OP\_plus}
@@ -40,5 +40,9 @@ one \livelink{chap:DWOPplus}{DW\_OP\_plus}
 \begin{alltt}
 \begin{alltt}
 
+%The following has digits, do not update automatically.
+
+ \livelink{chap:DWOPplus1}{DW\_OP\_plus1}
+