|
238 | 238 | EMBED : 1 |
239 | 239 | }; |
240 | 240 | var listCount = 1; |
241 | | - var lastCn; |
242 | 241 | DrillForContent = function(element, renderer, elementHandlers) { |
243 | 242 | var cn, cns, fragmentCSS, i, isBlock, l, px2pt, table2json; |
244 | 243 | cns = element.childNodes; |
|
278 | 277 | }); |
279 | 278 | renderer.y = renderer.pdf.lastCellPos.y + renderer.pdf.lastCellPos.h + 20; |
280 | 279 | } else if (cn.nodeName === "OL" || cn.nodeName === "UL") { |
281 | | - renderer.y += 10; |
282 | 280 | listCount = 1; |
283 | | - lastCn = cn; |
284 | 281 | if (!elementHandledElsewhere(cn, renderer, elementHandlers)) { |
285 | 282 | DrillForContent(cn, renderer, elementHandlers); |
286 | 283 | } |
| 284 | + renderer.y += 10; |
287 | 285 | } else if (cn.nodeName === "LI") { |
288 | 286 | var temp = renderer.x; |
289 | 287 | renderer.x += cn.parentNode.nodeName === "UL" ? 22 : 10; |
|
292 | 290 | } |
293 | 291 | renderer.x = temp; |
294 | 292 | } else { |
295 | | - if (lastCn && (lastCn.nodeName === "UL" || lastCn.nodeName === "OL")) { |
296 | | - renderer.y += 10; |
297 | | - lastCn = false; |
298 | | - } |
299 | 293 | if (!elementHandledElsewhere(cn, renderer, elementHandlers)) { |
300 | 294 | DrillForContent(cn, renderer, elementHandlers); |
301 | 295 | } |
|
304 | 298 | var value = cn.nodeValue; |
305 | 299 | if (cn.nodeValue && cn.parentNode.nodeName === "LI") { |
306 | 300 | if (cn.parentNode.parentNode.nodeName === "OL") { |
307 | | - value = listCount++ + ". " + value; |
| 301 | + value = listCount++ + '. ' + value; |
308 | 302 | } else { |
309 | | - renderer.pdf.circle(renderer.x - 9, renderer.y + 9, 2, "FD"); |
| 303 | + renderer.pdf.circle(renderer.x - 9, renderer.y + 9, 2, 'FD'); |
310 | 304 | } |
311 | 305 | } |
312 | 306 | renderer.addText(value, fragmentCSS); |
|
316 | 310 | } |
317 | 311 | i++; |
318 | 312 | } |
| 313 | + |
319 | 314 | if (isBlock) { |
320 | 315 | return renderer.setBlockBoundary(); |
321 | 316 | } |
|
0 commit comments