Bugfix collection

.gitignore

@@ -38,7 +38,5 @@ docs/API/_templates/
 *.egg
 .eggs/
 .cache
-.pytest_cache/
-.pytest_cache/v/cache/nodeids
-
+.pytest_cache/*
 build

quantipy/core/batch.py

@@ -534,15 +534,16 @@ def extend_x(self, ext_xks):
                         msg = '{}: Cannot use an array item as position'
                         raise ValueError(msg.format(pos))
                     if not isinstance(var, list): var = [var]
-                    for v in var:
+                    for v in self.unroll(var, both="all"):
                         if v in self.xks:
                             msg = '{} is already included as downbreak.'
                             raise ValueError(msg.format(v))
                         self.xks.insert(self.xks.index(pos), v)
             else:
-                if x not in self:
-                    raise KeyError('{} is not included.'.format(x))
-                self.xks.append(x)
+                for var in self.unroll(x, both="all"):
+                    if var not in self:
+                        raise KeyError('{} is not included.'.format(var))
+                    self.xks.append(var)
         self._update()
         return None
 
@@ -1254,6 +1255,9 @@ def to_dataset(self, mode=None, from_set=None, additions="sort_within",
         ds = qp.DataSet(self.name, self._dimensions_comp)
         ds.from_components(self._data.copy(), org_copy.deepcopy(self._meta),
                            True, self.language)
+        for b in ds.batches():
+            if not (b in adds or b == ds.name):
+                del ds._meta['sets']['batches'][b]
 
         if merge_f:
             ds.merge_filter(f, filters)

quantipy/sandbox/pptx/PptxDefaultsClass.py

@@ -110,6 +110,7 @@ def update_shape(self, shape, settings):
         """
         parameter_map = {'shapes': self._shapes,
                       'charts': self._charts,
+                      'tables': self._tables,
                       'textboxes': self._textboxes,
                       'chart_bar': self._chart_bar,
                       'chart_bar_stacked100': self._chart_bar_stacked100,