Found a bug in the python dellivelink.py and fixed it. Added a bit to the

testcase in tools to expose the bug.

diff --git a/dwarf5/tools/dellivelink.py b/dwarf5/tools/dellivelink.py
index 5381915..b1f1991 100644 (file)
--- a/dwarf5/tools/dellivelink.py
+++ b/dwarf5/tools/dellivelink.py
@@ -68,7 +68,7 @@ def newt(toks,curtoknum,finalchars,):
 
 def checkalltt(linetoks,tnumin,lasttoknum,myfile,linenum):
     global insidealltt
-    if int(tnumin) + 3 < int(lasttoknum):  
+    if ( int(tnumin) + 3 ) > int(lasttoknum):  
       return "n"
     t1 = linetoks[tnumin]
     s1 = myjoinlabel(t1)
@@ -90,6 +90,7 @@ def checkalltt(linetoks,tnumin,lasttoknum,myfile,linenum):
       return "n"
 
     if  s1 == "\\begin":
+
       if insidealltt =="y":
         print "nested \\begin{alltt} is an error in",myfile._name, " at ",linenum
       insidealltt = "y" 
@@ -97,6 +98,7 @@ def checkalltt(linetoks,tnumin,lasttoknum,myfile,linenum):
       if insidealltt =="n":
         print "nested \\end{alltt} is an error in",myfile._name, " at ",linenum
       insidealltt = "n" 
+    return "y"
 
 def transfunc(linetoks,myfile,linenum):
   global insidealltt
@@ -107,7 +109,7 @@ def transfunc(linetoks,myfile,linenum):
   lasttoknum = len(linetoks) -1
   outtoks = []
   for x in linetoks:
-    if tnumin > lasttoknum:
+    if int(tnumin) > int(lasttoknum):
       break
     t = linetoks[tnumin]
     rawtok = ''.join(t._tex)

diff --git a/dwarf5/tools/dellivelink.tex b/dwarf5/tools/dellivelink.tex
index d359d83..ddf117e 100644 (file)
--- a/dwarf5/tools/dellivelink.tex
+++ b/dwarf5/tools/dellivelink.tex
@@ -34,11 +34,6 @@ one \livelink{chap:DWOPplus}{DW\_OP\_plus}
 
 \end{alltt}
 
-% The following has nesting errors of alltt to see the
-% error checking works.
-\end{alltt}
-\begin{alltt}
-\begin{alltt}
 
 %The following has digits, do not update automatically.
 
@@ -46,3 +41,37 @@ one \livelink{chap:DWOPplus}{DW\_OP\_plus}
 
 
 
+\begin{figure}[ht]
+\begin{alltt}\textit{
+                        Line Advance
+   Operation  
+     Advance    -3  -2  -1   0   1   2   3   4   5   6   7   8
+   ---------   -----------------------------------------------
+           0    13  14  15  16  17  18  19  20  21  22  23  24
+           1    25  26  27  28  29  30  31  32  33  34  35  36
+           2    37  38  39  40  41  42  43  44  45  46  47  48
+           3    49  50  51  52  53  54  55  56  57  58  59  60
+           4    61  62  63  64  65  66  67  68  69  70  71  72
+           5    73  74  75  76  77  78  79  80  81  82  83  84
+           6    85  86  87  88  89  90  91  92  93  94  95  96
+           7    97  98  99 100 101 102 103 104 105 106 107 108
+           8   109 110 111 112 113 114 115 116 117 118 119 120
+           9   121 122 123 124 125 126 127 128 129 130 131 132
+          10   133 134 135 136 137 138 139 140 141 142 143 144
+          11   145 146 147 148 149 150 151 152 153 154 155 156
+          12   157 158 159 160 161 162 163 164 165 166 167 168
+          13   169 170 171 172 173 174 175 176 177 178 179 180
+          14   181 182 183 184 185 186 187 188 189 190 191 192
+          15   193 194 195 196 197 198 199 200 201 202 203 204
+          16   205 206 207 208 209 210 211 212 213 214 215 216
+          17   217 218 219 220 221 222 223 224 225 226 227 228 
+          18   229 230 231 232 233 234 235 236 237 238 239 240 
+          19   241 242 243 244 245 246 247 248 249 250 251 252
+          20   253 254 255
+}\end{alltt}
+
+% The following has nesting errors of alltt to see the
+% error checking works.
+\end{alltt}
+\begin{alltt}
+\begin{alltt}