@@ -95,16 +95,31 @@ class _object:
95
95
pass
96
96
_newclass = 0
97
97
98
+ FZ_PLOTTERS_G = _fitz .FZ_PLOTTERS_G
99
+ FZ_PLOTTERS_RGB = _fitz .FZ_PLOTTERS_RGB
100
+ FZ_PLOTTERS_CMYK = _fitz .FZ_PLOTTERS_CMYK
101
+ FZ_PLOTTERS_N = _fitz .FZ_PLOTTERS_N
102
+ FZ_ENABLE_PDF = _fitz .FZ_ENABLE_PDF
103
+ FZ_ENABLE_XPS = _fitz .FZ_ENABLE_XPS
104
+ FZ_ENABLE_SVG = _fitz .FZ_ENABLE_SVG
105
+ FZ_ENABLE_CBZ = _fitz .FZ_ENABLE_CBZ
106
+ FZ_ENABLE_IMG = _fitz .FZ_ENABLE_IMG
107
+ FZ_ENABLE_TIFF = _fitz .FZ_ENABLE_TIFF
108
+ FZ_ENABLE_HTML = _fitz .FZ_ENABLE_HTML
109
+ FZ_ENABLE_EPUB = _fitz .FZ_ENABLE_EPUB
110
+ FZ_ENABLE_GPRF = _fitz .FZ_ENABLE_GPRF
111
+ FZ_ENABLE_JPX = _fitz .FZ_ENABLE_JPX
112
+ FZ_ENABLE_JS = _fitz .FZ_ENABLE_JS
98
113
99
114
import weakref
100
115
from binascii import hexlify
101
116
import math
102
117
103
118
104
119
VersionFitz = "1.13.0"
105
- VersionBind = "1.13.15 "
106
- VersionDate = "2018-07-25 23:50:27 "
107
- version = (VersionBind , VersionFitz , "20180725235027 " )
120
+ VersionBind = "1.13.16 "
121
+ VersionDate = "2018-08-01 13:43:15 "
122
+ version = (VersionBind , VersionFitz , "20180801134315 " )
108
123
109
124
110
125
#------------------------------------------------------------------------------
@@ -640,6 +655,8 @@ def _make_line_AP(annot, nv = None, r0 = None):
640
655
w = annot .border ["width" ] # get line width
641
656
sc = annot .colors ["stroke" ] # get stroke color
642
657
fc = annot .colors ["fill" ] # get fill color
658
+ ca = annot .opacity # get opacity value
659
+ Alp0 = "/Alp0 gs\n " if ca >= 0 else ""
643
660
vert = nv if nv else annot .vertices # get list of points
644
661
rn = r0 if r0 else annot .rect
645
662
h = rn .height # annot rectangle height
@@ -658,7 +675,7 @@ def _make_line_AP(annot, nv = None, r0 = None):
658
675
dtab = "" .join (dtab )
659
676
660
677
# start /AP string with a goto command
661
- ap = "q\n %g %g m\n " % (vert [0 ][0 ] - x0 , h - (vert [0 ][1 ] - y0 ))
678
+ ap = "q\n %s% g %g m\n " % (Alp0 , vert [0 ][0 ] - x0 , h - (vert [0 ][1 ] - y0 ))
662
679
663
680
# add line commands for all subsequent points
664
681
for v in vert [1 :]:
@@ -718,6 +735,8 @@ def _make_rect_AP(annot):
718
735
w = annot .border ["width" ] # get line width
719
736
sc = annot .colors ["stroke" ] # get stroke color
720
737
fc = annot .colors ["fill" ] # get fill color
738
+ ca = annot .opacity # get opacity value
739
+ Alp0 = "/Alp0 gs\n " if ca >= 0 else ""
721
740
scol = "%g %g %g RG " % (sc [0 ], sc [1 ], sc [2 ]) if sc else "0 0 0 RG "
722
741
fcol = "%g %g %g rg " % (fc [0 ], fc [1 ], fc [2 ]) if fc else ""
723
742
dt = annot .border .get ("dashes" )
@@ -731,7 +750,7 @@ def _make_rect_AP(annot):
731
750
r1 = r2 = w / 2. # rect starts bottom-left here
732
751
r3 = r .width - w # rect width reduced by line width
733
752
r4 = r .height - w # rect height reduced by line with
734
- ap = "q\n %g %g %g %g re %g w 1 J 1 j\n " % (r1 , r2 , r3 , r4 , w )
753
+ ap = "q\n %s% g %g %g %g re %g w 1 J 1 j\n " % (Alp0 , r1 , r2 , r3 , r4 , w )
735
754
ap += scol + fcol + dtab
736
755
if fcol :
737
756
ap += "\n b\n Q\n "
@@ -762,6 +781,8 @@ def _make_circle_AP(annot):
762
781
sc = annot .colors ["stroke" ]
763
782
scol = "%g %g %g RG " % (sc [0 ], sc [1 ], sc [2 ]) if sc else "0 0 0 RG "
764
783
fc = annot .colors ["fill" ]
784
+ ca = annot .opacity # get opacity value
785
+ Alp0 = "/Alp0 gs\n " if ca >= 0 else ""
765
786
fcol = "%g %g %g rg " % (fc [0 ], fc [1 ], fc [2 ]) if fc else ""
766
787
dt = annot .border .get ("dashes" )
767
788
dtab = []
@@ -775,7 +796,7 @@ def _make_circle_AP(annot):
775
796
h = annot .rect .height
776
797
r = Rect (lw2 , lw2 , annot .rect .width - lw2 , h - lw2 )
777
798
778
- ap = "q\n " + _oval_string (h , r .tl , r .tr , r .br , r .bl )
799
+ ap = "q\n " + Alp0 + _oval_string (h , r .tl , r .tr , r .br , r .bl )
779
800
ap += "%g w 1 J 1 j\n " % lw
780
801
ap += scol + fcol + dtab
781
802
if fcol :
@@ -2095,9 +2116,9 @@ def _cleanContents(self):
2095
2116
return _fitz .Page__cleanContents (self )
2096
2117
2097
2118
2098
- def _showPDFpage (self , rect , docsrc , pno = 0 , overlay = 1 , keep_proportion = 1 , reuse_xref = 0 , clip = None , graftmap = None ):
2099
- """_showPDFpage(self, rect, docsrc, pno=0, overlay=1, keep_proportion=1, reuse_xref=0, clip=None, graftmap=None) -> int"""
2100
- return _fitz .Page__showPDFpage (self , rect , docsrc , pno , overlay , keep_proportion , reuse_xref , clip , graftmap )
2119
+ def _showPDFpage (self , rect , docsrc , pno = 0 , overlay = 1 , keep_proportion = 1 , reuse_xref = 0 , clip = None , graftmap = None , _imgname = None ):
2120
+ """_showPDFpage(self, rect, docsrc, pno=0, overlay=1, keep_proportion=1, reuse_xref=0, clip=None, graftmap=None, _imgname=None ) -> int"""
2121
+ return _fitz .Page__showPDFpage (self , rect , docsrc , pno , overlay , keep_proportion , reuse_xref , clip , graftmap , _imgname )
2101
2122
2102
2123
2103
2124
def insertImage (self , rect , filename = None , pixmap = None , stream = None , overlay = 1 , _imgname = None ):
@@ -2106,7 +2127,7 @@ def insertImage(self, rect, filename=None, pixmap=None, stream=None, overlay=1,
2106
2127
CheckParent (self )
2107
2128
imglst = self .parent .getPageImageList (self .number )
2108
2129
ilst = [i [7 ] for i in imglst ]
2109
- n = "fitzImg "
2130
+ n = "fzImg "
2110
2131
i = 0
2111
2132
_imgname = n + "0"
2112
2133
while _imgname in ilst :
@@ -3330,7 +3351,10 @@ def setOpacity(self, opacity):
3330
3351
"""setOpacity(self, opacity)"""
3331
3352
CheckParent (self )
3332
3353
3333
- return _fitz .Annot_setOpacity (self , opacity )
3354
+ val = _fitz .Annot_setOpacity (self , opacity )
3355
+ _upd_my_AP (self )
3356
+
3357
+ return val
3334
3358
3335
3359
@property
3336
3360
@@ -3834,6 +3858,12 @@ def store_maxsize(self):
3834
3858
"""Maximum store size."""
3835
3859
return _fitz .Tools_store_maxsize (self )
3836
3860
3861
+ @property
3862
+
3863
+ def fitz_config (self ):
3864
+ """Show configuration data."""
3865
+ return _fitz .Tools_fitz_config (self )
3866
+
3837
3867
3838
3868
def _store_debug (self ):
3839
3869
"""_store_debug(self)"""
@@ -3845,11 +3875,6 @@ def glyph_cache_empty(self):
3845
3875
return _fitz .Tools_glyph_cache_empty (self )
3846
3876
3847
3877
3848
- def font_config (self ):
3849
- """font_config(self) -> PyObject *"""
3850
- return _fitz .Tools_font_config (self )
3851
-
3852
-
3853
3878
def __init__ (self ):
3854
3879
"""__init__(self) -> Tools"""
3855
3880
this = _fitz .new_Tools ()
0 commit comments