comparing 22e582753cf8a0c220ea926f82315a7326602d26 and main on cduck.me/drawsvg

+3 -3

docs/img/04_align.svg

···

       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
        
       <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
       -
            width="250" height="120" viewBox="0 0 250 120">

     

       4
        
       <defs>

     

       5
        
       </defs>

     

       6
        
       <path d="M75,100 L75,0" stroke="gray" />

     
···

       10
        
       <text x="75" y="30" font-size="24" text-anchor="start">Start</text>

     

       11
        
       <text x="75" y="60" font-size="24" text-anchor="middle">Middle</text>

     

       12
        
       <text x="75" y="90" font-size="24" text-anchor="end">End</text>

     

       13
       -
       <text x="150" y="30" font-size="24" dominant-baseline="bottom">Auto</text>

     

       14
        
       <text x="150" y="60" font-size="24" dominant-baseline="middle">Middle</text>

     

       15
       -
       <text x="150" y="90" font-size="24" dominant-baseline="top">Hanging</text>

     

       16
        
       </svg>

···

       1
        
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
        
       <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"

     

       3
       +
           width="250" height="120" viewBox="0 0 250 120">

     

       4
        
       <defs>

     

       5
        
       </defs>

     

       6
        
       <path d="M75,100 L75,0" stroke="gray" />

     
···

       10
        
       <text x="75" y="30" font-size="24" text-anchor="start">Start</text>

     

       11
        
       <text x="75" y="60" font-size="24" text-anchor="middle">Middle</text>

     

       12
        
       <text x="75" y="90" font-size="24" text-anchor="end">End</text>

     

       13
       +
       <text x="150" y="30" font-size="24" dominant-baseline="auto">Auto</text>

     

       14
        
       <text x="150" y="60" font-size="24" dominant-baseline="middle">Middle</text>

     

       15
       +
       <text x="150" y="90" font-size="24" dominant-baseline="hanging">Hanging</text>

     

       16
        
       </svg>

+2 -2

docs/index.md

···

       604
        
       d.append(dw.Text('Start', 24, 75, 30, text_anchor='start'))

     

       605
        
       d.append(dw.Text('Middle', 24, 75, 60, text_anchor='middle'))

     

       606
        
       d.append(dw.Text('End', 24, 75, 90, text_anchor='end'))

     

       607
       -
       d.append(dw.Text('Auto', 24, 150, 30, dominant_baseline='bottom'))

     

       608
        
       d.append(dw.Text('Middle', 24, 150, 60, dominant_baseline='middle'))

     

       609
       -
       d.append(dw.Text('Hanging', 24, 150, 90, dominant_baseline='top'))

     

       610
        
       ```

     

       611
        
       

     

       612
        
       ![svg](img/04_align.svg)

···

       604
        
       d.append(dw.Text('Start', 24, 75, 30, text_anchor='start'))

     

       605
        
       d.append(dw.Text('Middle', 24, 75, 60, text_anchor='middle'))

     

       606
        
       d.append(dw.Text('End', 24, 75, 90, text_anchor='end'))

     

       607
       +
       d.append(dw.Text('Auto', 24, 150, 30, dominant_baseline='auto'))

     

       608
        
       d.append(dw.Text('Middle', 24, 150, 60, dominant_baseline='middle'))

     

       609
       +
       d.append(dw.Text('Hanging', 24, 150, 90, dominant_baseline='hanging'))

     

       610
        
       ```

     

       611
        
       

     

       612
        
       ![svg](img/04_align.svg)

+14 -3

drawsvg/drawing.py

···

       133
        
               else:

     

       134
        
                   self.elements.extend(iterable)

     

       135
        
           def insert(self, i, element):

     

       0
        
       
     

       136
        
               self.elements.insert(i, element)

     

       137
        
           def remove(self, element):

     

       0
        
       
     

       138
        
               self.elements.remove(element)

     

       139
        
           def clear(self):

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       140
        
               self.elements.clear()

     

       0
        
       
     

       141
        
           def index(self, *args, **kwargs):

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       142
        
               return self.elements.index(*args, **kwargs)

     

       143
        
           def count(self, element):

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       144
        
               return self.elements.count(element)

     

       145
        
           def reverse(self):

     

       0
        
       
     

       146
        
               self.elements.reverse()

     

       147
        
           def draw_def(self, obj, **kwargs):

     

       148
        
               if not hasattr(obj, 'write_svg_element'):

     
···

       249
        
                   id_index += 1

     

       250
        
                   return id_str

     

       251
        
               id_map = defaultdict(id_gen)

     

       252
       -
               prev_set = set((id(defn) for defn in self.other_defs))

     

       253
       -
               prev_list = []

     

       254
        
               def is_duplicate(obj):

     

       255
        
                   nonlocal prev_set

     

       256
        
                   dup = id(obj) in prev_set

     

       257
        
                   prev_set.add(id(obj))

     

       258
       -
                   prev_list.append(obj)

     

       259
        
                   return dup

     

       260
        
               for element in self.other_defs:

     

       261
        
                   if hasattr(element, 'write_svg_element'):

···

       133
        
               else:

     

       134
        
                   self.elements.extend(iterable)

     

       135
        
           def insert(self, i, element):

     

       136
       +
               '''Inserts a top-level element at the given array index.'''

     

       137
        
               self.elements.insert(i, element)

     

       138
        
           def remove(self, element):

     

       139
       +
               '''Removes a top-level element (except those with a z-index).'''

     

       140
        
               self.elements.remove(element)

     

       141
        
           def clear(self):

     

       142
       +
               '''Clears all drawing elements, with or without a z-index, but keeps

     

       143
       +
               defs-type elements added with `append_def()`.

     

       144
       +
               '''

     

       145
        
               self.elements.clear()

     

       146
       +
               self.ordered_elements.clear()

     

       147
        
           def index(self, *args, **kwargs):

     

       148
       +
               '''Finds the array-index of a top-level element (except those with a

     

       149
       +
               z-index).

     

       150
       +
               '''

     

       151
        
               return self.elements.index(*args, **kwargs)

     

       152
        
           def count(self, element):

     

       153
       +
               '''Counts the number of top-level elements (except those with a z-index

     

       154
       +
               ).

     

       155
       +
               '''

     

       156
        
               return self.elements.count(element)

     

       157
        
           def reverse(self):

     

       158
       +
               '''Reverses the order of all elements (except those with a z-index).'''

     

       159
        
               self.elements.reverse()

     

       160
        
           def draw_def(self, obj, **kwargs):

     

       161
        
               if not hasattr(obj, 'write_svg_element'):

     
···

       262
        
                   id_index += 1

     

       263
        
                   return id_str

     

       264
        
               id_map = defaultdict(id_gen)

     

       265
       +
               prev_set = set()

     

       0
        
       
     

       266
        
               def is_duplicate(obj):

     

       267
        
                   nonlocal prev_set

     

       268
        
                   dup = id(obj) in prev_set

     

       269
        
                   prev_set.add(id(obj))

     

       0
        
       
     

       270
        
                   return dup

     

       271
        
               for element in self.other_defs:

     

       272
        
                   if hasattr(element, 'write_svg_element'):

+25 -1

drawsvg/elements.py

···

       239
        
           '''

     

       240
        
           TAG_NAME = 'text'

     

       241
        
           has_content = True

     

       242
       -
           def __new__(cls, text, *args, path=None, id=None, _skip_check=False,

     

       243
        
                       **kwargs):

     

       244
        
               # Check for the special case of multi-line text on a path

     

       245
        
               # This is inconsistently implemented by renderers so we return a group

     
···

       597
        
           def __init__(self, cx, cy, r, start_deg, end_deg, cw=False, **kwargs):

     

       598
        
               super().__init__(d='', **kwargs)

     

       599
        
               self.arc(cx, cy, r, start_deg, end_deg, cw=cw, include_m=True)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       239
        
           '''

     

       240
        
           TAG_NAME = 'text'

     

       241
        
           has_content = True

     

       242
       +
           def __new__(cls, text='', *args, path=None, id=None, _skip_check=False,

     

       243
        
                       **kwargs):

     

       244
        
               # Check for the special case of multi-line text on a path

     

       245
        
               # This is inconsistently implemented by renderers so we return a group

     
···

       597
        
           def __init__(self, cx, cy, r, start_deg, end_deg, cw=False, **kwargs):

     

       598
        
               super().__init__(d='', **kwargs)

     

       599
        
               self.arc(cx, cy, r, start_deg, end_deg, cw=cw, include_m=True)

     

       600
       +
       

     

       601
       +
       class ForeignObject(DrawingBasicElement):

     

       602
       +
           '''A foreign object, i.e. for embedding HTML.

     

       603
       +
       

     

       604
       +
           In the context of SVG embedded in an HTML document, the XHTML namespace

     

       605
       +
           could be omitted in the foreignObject content, but it is mandatory in the

     

       606
       +
           context of an SVG document.

     

       607
       +
       

     

       608
       +
           This element works best when viewing the SVG in a browser. Drawing.rasterize()

     

       609
       +
           and Drawing.save_png() are unable to display this element.

     

       610
       +
       

     

       611
       +
           Additional keyword arguments are output as additional arguments to the SVG

     

       612
       +
           node e.g. fill="red", stroke="#ff4477", stroke_width=2.

     

       613
       +
           '''

     

       614
       +
           TAG_NAME = 'foreignObject'

     

       615
       +
           has_content = True

     

       616
       +
           def __init__(self, content, **kwargs):

     

       617
       +
               super().__init__(**kwargs)

     

       618
       +
               self.content = content

     

       619
       +
           def write_content(self, id_map, is_duplicate, output_file, lcontext,

     

       620
       +
                             dry_run):

     

       621
       +
               if dry_run:

     

       622
       +
                   return

     

       623
       +
               output_file.write(self.content)

+11

drawsvg/widgets/drawing_javascript.py

···

       71
        
                   var svg_pt = this.cursor_point.matrixTransform(

     

       72
        
                                   this.svg_view.getScreenCTM().inverse());

     

       73
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
                   this.send({

     

       75
        
                       name: name,

     

       76
        
                       x: svg_pt.x,

     
···

       88
        
                       movementY: e.movementY,

     

       89
        
                       timeStamp: e.timeStamp,

     

       90
        
                       targetId: e.target ? e.target.id : null,

     

       0
        
       
     

       91
        
                       currentTargetId: e.currentTarget ? e.currentTarget.id : null,

     

       92
        
                       relatedTargetId: e.relatedTarget ? e.relatedTarget.id : null,

     

       93
        
                   });

···

       71
        
                   var svg_pt = this.cursor_point.matrixTransform(

     

       72
        
                                   this.svg_view.getScreenCTM().inverse());

     

       73
        
       

     

       74
       +
                   var target_parents = [];

     

       75
       +
                   var target = e.target;

     

       76
       +
                   while(target && target != this.svg_view)

     

       77
       +
                   {

     

       78
       +
                       if (target.id) {

     

       79
       +
                           target_parents.push(target.id);

     

       80
       +
                       }

     

       81
       +
                       target = target.parentNode;

     

       82
       +
                   }

     

       83
       +
       

     

       84
        
                   this.send({

     

       85
        
                       name: name,

     

       86
        
                       x: svg_pt.x,

     
···

       98
        
                       movementY: e.movementY,

     

       99
        
                       timeStamp: e.timeStamp,

     

       100
        
                       targetId: e.target ? e.target.id : null,

     

       101
       +
                       targetParentIds: target_parents,

     

       102
        
                       currentTargetId: e.currentTarget ? e.currentTarget.id : null,

     

       103
        
                       relatedTargetId: e.relatedTarget ? e.relatedTarget.id : null,

     

       104
        
                   });

+1 -1

setup.py

···

       2
        
       import logging

     

       3
        
       logger = logging.getLogger(__name__)

     

       4
        
       

     

       5
       -
       version = '2.1.0'

     

       6
        
       

     

       7
        
       try:

     

       8
        
           with open('README.md', 'r') as f:

···

       2
        
       import logging

     

       3
        
       logger = logging.getLogger(__name__)

     

       4
        
       

     

       5
       +
       version = '2.4.0'

     

       6
        
       

     

       7
        
       try:

     

       8
        
           with open('README.md', 'r') as f:

Compare changes