@@ -195,7 +195,7 @@ class Dvi(object):
195
195
"""
196
196
# dispatch table
197
197
_dtable = [None for _ in xrange (256 )]
198
- dispatch = partial (_dispatch , _dtable )
198
+ _dispatch = partial (_dispatch , _dtable )
199
199
200
200
def __init__ (self , filename , dpi ):
201
201
"""
@@ -332,22 +332,22 @@ def _arg(self, nbytes, signed=False):
332
332
value = 0x100 * value + ord (str [i ])
333
333
return value
334
334
335
- @dispatch (min = 0 , max = 127 , state = _dvistate .inpage )
335
+ @_dispatch (min = 0 , max = 127 , state = _dvistate .inpage )
336
336
def _set_char_immediate (self , char ):
337
337
self ._put_char_real (char )
338
338
self .h += self .fonts [self .f ]._width_of (char )
339
339
340
- @dispatch (min = 128 , max = 131 , state = _dvistate .inpage , args = ('olen1' ,))
340
+ @_dispatch (min = 128 , max = 131 , state = _dvistate .inpage , args = ('olen1' ,))
341
341
def _set_char (self , char ):
342
342
self ._put_char_real (char )
343
343
self .h += self .fonts [self .f ]._width_of (char )
344
344
345
- @dispatch (132 , state = _dvistate .inpage , args = ('s4' , 's4' ))
345
+ @_dispatch (132 , state = _dvistate .inpage , args = ('s4' , 's4' ))
346
346
def _set_rule (self , a , b ):
347
347
self ._put_rule_real (a , b )
348
348
self .h += b
349
349
350
- @dispatch (min = 133 , max = 136 , state = _dvistate .inpage , args = ('olen1' ,))
350
+ @_dispatch (min = 133 , max = 136 , state = _dvistate .inpage , args = ('olen1' ,))
351
351
def _put_char (self , char ):
352
352
self ._put_char_real (char )
353
353
@@ -369,80 +369,80 @@ def _put_char_real(self, char):
369
369
_mul2012 (a , scale ), _mul2012 (b , scale ))
370
370
for x , y , a , b in font ._vf [char ].boxes ])
371
371
372
- @dispatch (137 , state = _dvistate .inpage , args = ('s4' , 's4' ))
372
+ @_dispatch (137 , state = _dvistate .inpage , args = ('s4' , 's4' ))
373
373
def _put_rule (self , a , b ):
374
374
self ._put_rule_real (a , b )
375
375
376
376
def _put_rule_real (self , a , b ):
377
377
if a > 0 and b > 0 :
378
378
self .boxes .append (Box (self .h , self .v , a , b ))
379
379
380
- @dispatch (138 )
380
+ @_dispatch (138 )
381
381
def _nop (self , _ ):
382
382
pass
383
383
384
- @dispatch (139 , state = _dvistate .outer , args = ('s4' ,)* 11 )
384
+ @_dispatch (139 , state = _dvistate .outer , args = ('s4' ,)* 11 )
385
385
def _bop (self , c0 , c1 , c2 , c3 , c4 , c5 , c6 , c7 , c8 , c9 , p ):
386
386
self .state = _dvistate .inpage
387
387
self .h , self .v , self .w , self .x , self .y , self .z = 0 , 0 , 0 , 0 , 0 , 0
388
388
self .stack = []
389
389
self .text = [] # list of Text objects
390
390
self .boxes = [] # list of Box objects
391
391
392
- @dispatch (140 , state = _dvistate .inpage )
392
+ @_dispatch (140 , state = _dvistate .inpage )
393
393
def _eop (self , _ ):
394
394
self .state = _dvistate .outer
395
395
del self .h , self .v , self .w , self .x , self .y , self .z , self .stack
396
396
397
- @dispatch (141 , state = _dvistate .inpage )
397
+ @_dispatch (141 , state = _dvistate .inpage )
398
398
def _push (self , _ ):
399
399
self .stack .append ((self .h , self .v , self .w , self .x , self .y , self .z ))
400
400
401
- @dispatch (142 , state = _dvistate .inpage )
401
+ @_dispatch (142 , state = _dvistate .inpage )
402
402
def _pop (self , _ ):
403
403
self .h , self .v , self .w , self .x , self .y , self .z = self .stack .pop ()
404
404
405
- @dispatch (min = 143 , max = 146 , state = _dvistate .inpage , args = ('slen1' ,))
405
+ @_dispatch (min = 143 , max = 146 , state = _dvistate .inpage , args = ('slen1' ,))
406
406
def _right (self , b ):
407
407
self .h += b
408
408
409
- @dispatch (min = 147 , max = 151 , state = _dvistate .inpage , args = ('slen' ,))
409
+ @_dispatch (min = 147 , max = 151 , state = _dvistate .inpage , args = ('slen' ,))
410
410
def _right_w (self , new_w ):
411
411
if new_w is not None :
412
412
self .w = new_w
413
413
self .h += self .w
414
414
415
- @dispatch (min = 152 , max = 156 , state = _dvistate .inpage , args = ('slen' ,))
415
+ @_dispatch (min = 152 , max = 156 , state = _dvistate .inpage , args = ('slen' ,))
416
416
def _right_x (self , new_x ):
417
417
if new_x is not None :
418
418
self .x = new_x
419
419
self .h += self .x
420
420
421
- @dispatch (min = 157 , max = 160 , state = _dvistate .inpage , args = ('slen1' ,))
421
+ @_dispatch (min = 157 , max = 160 , state = _dvistate .inpage , args = ('slen1' ,))
422
422
def _down (self , a ):
423
423
self .v += a
424
424
425
- @dispatch (min = 161 , max = 165 , state = _dvistate .inpage , args = ('slen' ,))
425
+ @_dispatch (min = 161 , max = 165 , state = _dvistate .inpage , args = ('slen' ,))
426
426
def _down_y (self , new_y ):
427
427
if new_y is not None :
428
428
self .y = new_y
429
429
self .v += self .y
430
430
431
- @dispatch (min = 166 , max = 170 , state = _dvistate .inpage , args = ('slen' ,))
431
+ @_dispatch (min = 166 , max = 170 , state = _dvistate .inpage , args = ('slen' ,))
432
432
def _down_z (self , new_z ):
433
433
if new_z is not None :
434
434
self .z = new_z
435
435
self .v += self .z
436
436
437
- @dispatch (min = 171 , max = 234 , state = _dvistate .inpage )
437
+ @_dispatch (min = 171 , max = 234 , state = _dvistate .inpage )
438
438
def _fnt_num_immediate (self , k ):
439
439
self .f = k
440
440
441
- @dispatch (min = 235 , max = 238 , state = _dvistate .inpage , args = ('olen1' ,))
441
+ @_dispatch (min = 235 , max = 238 , state = _dvistate .inpage , args = ('olen1' ,))
442
442
def _fnt_num (self , new_f ):
443
443
self .f = new_f
444
444
445
- @dispatch (min = 239 , max = 242 , args = ('ulen1' ,))
445
+ @_dispatch (min = 239 , max = 242 , args = ('ulen1' ,))
446
446
def _xxx (self , datalen ):
447
447
special = self .file .read (datalen )
448
448
if six .PY3 :
@@ -455,7 +455,7 @@ def chr_(x):
455
455
'' .join ([chr_ (ch ) if 32 <= ord (ch ) < 127 else '<%02x>' % ord (ch )
456
456
for ch in special ]))
457
457
458
- @dispatch (min = 243 , max = 246 , args = ('olen1' , 'u4' , 'u4' , 'u4' , 'u1' , 'u1' ))
458
+ @_dispatch (min = 243 , max = 246 , args = ('olen1' , 'u4' , 'u4' , 'u4' , 'u1' , 'u1' ))
459
459
def _fnt_def (self , k , c , s , d , a , l ):
460
460
self ._fnt_def_real (k , c , s , d , a , l )
461
461
@@ -476,7 +476,7 @@ def _fnt_def_real(self, k, c, s, d, a, l):
476
476
477
477
self .fonts [k ] = DviFont (scale = s , tfm = tfm , texname = n , vf = vf )
478
478
479
- @dispatch (247 , state = _dvistate .pre , args = ('u1' , 'u4' , 'u4' , 'u4' , 'u1' ))
479
+ @_dispatch (247 , state = _dvistate .pre , args = ('u1' , 'u4' , 'u4' , 'u4' , 'u1' ))
480
480
def _pre (self , i , num , den , mag , k ):
481
481
comment = self .file .read (k )
482
482
if i != 2 :
@@ -494,17 +494,17 @@ def _pre(self, i, num, den, mag, k):
494
494
# I think we can assume this is constant
495
495
self .state = _dvistate .outer
496
496
497
- @dispatch (248 , state = _dvistate .outer )
497
+ @_dispatch (248 , state = _dvistate .outer )
498
498
def _post (self , _ ):
499
499
self .state = _dvistate .post_post
500
500
# TODO: actually read the postamble and finale?
501
501
# currently post_post just triggers closing the file
502
502
503
- @dispatch (249 )
503
+ @_dispatch (249 )
504
504
def _post_post (self , _ ):
505
505
raise NotImplementedError
506
506
507
- @dispatch (min = 250 , max = 255 )
507
+ @_dispatch (min = 250 , max = 255 )
508
508
def _malformed (self , offset ):
509
509
raise ValueError ("unknown command: byte %d" , 250 + offset )
510
510
0 commit comments