ipyslides 7.3.0__tar.gz → 7.3.2__tar.gz

{ipyslides-7.3.0 → ipyslides-7.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyslides
-Version: 7.3.0
+Version: 7.3.2
 Summary: Live rich content slides in jupyter notebook
 Home-page: https://github.com/asaboor-gh/ipyslides
 Author: Abdul Saboor

ipyslides-7.3.2/ipyslides/__version__.py

@@ -0,0 +1,2 @@
+
+__version__ = "7.3.2"

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/_base/_syntax.py

@@ -27,13 +27,14 @@ Use any or combination of these styles in markdown blocks or `css_class` argumen
  `raw-text`         | Text will be shown as printed style. {: .raw-text}
  `focus-self`       | Double-click on element to zoom into popup view. Double-click again or navigate slides to exit. {: .focus-self}
  `focus-child`      | Focus on child objects of node with this class. Same double-click to zoom in/out behavior.
+ `column`           | Inside `columns`, if an element with no siblings has `column` class, it will stretch to full height of columns no matter how deeply nested it is.
 
 Besides these CSS classes, you always have `Slide.css`, `Slides.html('style',...)` functions at your disposal.
 '''
 # as function to let any call use escaped functions, otherwise they are lost on first use
 xmd_syntax = lambda: rf'''
 ## Extended Markdown
-++                                      
+--                                     
 Extended syntax on top of [Python-Markdown](https://python-markdown.github.io/) supports almost full presentation from Markdown.
 
 **Presentation Structure**{{.text-big}}
@@ -78,7 +79,7 @@ Citations
  key2: A citations can span multiple lines, but key should start on new line
 /]
 
-++
+--
 
 **Content Blocks**{{.text-big}}
 
@@ -118,7 +119,7 @@ The general block syntax is `::: type-or-classes [args] attributes`.
     - `md-[position or variable]` accepts same parameters as `code` block for syntax highlighting and get deleted on first use.
     - Both `code` and `md-var` blocks support attribute access such as `::: code.collapsed` or `::: md-var.inline` to show selected view. 
     You can also use `::: code 1 3` to focus on specific lines based on index 1 in markdown unlike Python.
-++
+--
 
 **Layouts**{{.text-big}}
 
@@ -156,7 +157,7 @@ Use `++` before `::: columns.paused` to separate previous content from first col
         ::: li .. This follows disc marker from parent `ul` block.
 ```
 
-++
+--
 
 **Code Display**{{.text-big}}
 
@@ -168,10 +169,10 @@ Code Blocks
 
 ```md-src
 ::: columns
-    ::: block-green
+    ::: column block-green
         [md-src/]
     --
-    ::: block-red
+    ::: column block-red
         ```python
         print('Hello, I was highlighted from a code block!')
         ```
@@ -190,7 +191,7 @@ Code Blocks
     [md-src/]
 ```
 
-++
+--
 
 **Variables Substitution**{{.text-big}}
 
@@ -218,7 +219,7 @@ Variables from Python code can be embedded directly into Markdown.
 - Widgets behave same with or without `:nb` format spec. 
 - Formatting is done using `str.format` method, so f-string like literal expressions are not supported.
     
-++
+--
 
 {esc(xmd.funcs)}
 
@@ -235,19 +236,20 @@ Inline functions can be nested, thanks to new function call pattern that must en
     --
     [md-src/]
 
-++
+--
 **General Syntax**{{.text-big}}
 
 - To avoid any further markdown parsing, use ` Slides.esc ` while interpolating variables or expressions in f-strings, such as `f"Hello {{esc(var)}}"` or `f"Hello {{esc(func())}}"`.
 - Use [alert! include\`markdown_file.md[optional list slicing to pick lines from file such as [2:5], [10:]]\` /] to include a file in markdown format.
 - Use [alert! [fa\! icon_name \/] /] to add FontAwesome icons, e.g. [fa\! arrow-right \/] → [fa! arrow-right /], [fa\! check .. "green" \/] → [fa! check .. "green" /] etc.
 - Drop a link target in any place using `[#target_id/]` and use `target_id` in `link` commnad or html anchor to jump to that target. Use `Slides.link` for more details.
-- Use syntax `[link\! "target_id", "Jump to slide" \/]` to jump between slides. See `Slides.link` for more details.
+- Use syntax `[link\!! "target_id", "Jump to slide" \/]` to jump between slides. See `Slides.link` for more details.
 - Cells in markdown table can be spanned to multiple rows/columns by attributes `| cell text \{{: rowspan="2" colspan="1"}}|` inside a cell, should be a space bewteen text and attributes.
 - Escape a backtick with backslash, i.e. [alert! \\` → \` /], other escape characters are [alert! {xmd.escaped_chars} /]. In Python >=3.12, you need to make escape strings raw, including the use of $ \LaTeX $ and re module.
 - Use html entities for special characters, e.g. `→` →, `←` ←, `↑` ↑, `↓` ↓, `↔` ↔, `⇅` ⇅, `⇐` ⇐, `⇒` ⇒, `⇑` ⇑, `⇓` ⇓, `⇔` ⇔ etc.
 - Use `sub` and `sup` functions for subscript and superscript respectively, e.g. H[sub!2/]O, E = mc[sup!2/].
 - See `Slides.css_styles` for available CSS classes to use in markdown blocks and other places.
+- Slide width/height in container query units can be used in functions/blocks that accept `width`/`height`, e.g. `[image\!..., width='50cqw' \/]` will span half the slide width.
 - See `Slides.css_animations` for available CSS animation classes to use in markdown blocks and other places.
 - Definition list syntax:
 ```md-src.inline
@@ -274,7 +276,7 @@ Inline functions can be nested, thanks to new function call pattern that must en
 css_animations = '''
 ## 🎬 IPySlides Content Animations
 
-++
+--
 
 All animations are **fully composable** - combine multiple animation classes to create complex effects! Use `anim-group` on a parent container to apply staggered animations to all children.
 
@@ -325,7 +327,7 @@ Variable | Default | Description
 `--kf-count` | 1 | Iteration count for `.anim-kf`.
 `--kf-direction` | normal | Animation direction for `.anim-kf`.
 
-++
+--
 
 ### 💡 Usage Examples
 
@@ -353,7 +355,7 @@ Variable | Default | Description
     Iris opens from top-left corner while zooming!
 ```
 
-++
+--
 
 **Custom Variables**
 ```md-after
@@ -384,7 +386,7 @@ Define `@keyframes` in Slides.css(...) or in a notebook cell.
     // Delays follow smooth sine curve: 100ms per 10 items
 ```
 
-++
+--
 
 **Per Item Origins** (Dynamic Effects)
 ```md-after
@@ -413,7 +415,7 @@ Define `@keyframes` in Slides.css(...) or in a notebook cell.
     Flips up from bottom while zooming!
 ```
 
-++
+--
 
 ### ✨ Key Features
 

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/_base/styles.py

@@ -576,6 +576,7 @@ def style_css(colors, fonts, layout, _root = False):
             'position': 'absolute !important',
             'width':'210mm !important', # A4 width letter page can have a little extra margin, important to have fixed width
             'height': f'{_safe_height(layout.aspect)}mm !important',
+            'container-type': 'size !important', # allows using cqh,cqw type relative units for better content scaling
             'transform-origin': 'center !important' if layout.centered else 'left top !important',
             'transform': 'translateZ(0) scale(var(--contentScale,1)) !important', # Set by Javascript , translateZ is important to avoid blurry text
             'padding' : '8px !important', # don't make 1em to avoid change size with fonts
@@ -586,11 +587,8 @@ def style_css(colors, fonts, layout, _root = False):
             '.jp-OutputArea': {
                 'max-height': f'{maxheight} !important', # avoid things get overflowing
                 'overflow': 'auto',
-                '.jp-OutputArea-child, .jp-OutputArea-output': {
+                '^, .jp-OutputArea-child, .jp-OutputArea-output': {
                     "position": "static !important", # absolute content should not be stuck here 
-                    "^:only-child, > *:only-child" : {
-                        'min-height': 'stretch !important', # useful for backgrounds stretching, like in write a full column from outside
-                    }
                 }, 
             },
             '> .jp-OutputArea': {
@@ -825,17 +823,23 @@ def style_css(colors, fonts, layout, _root = False):
             '.columns':{
                 'width':'100%',
                 'max-width':'100%',
-                'display':'inline-flex',
+                'display':'flex',
                 'flex-direction':'row',
                 'column-gap':'0.2em',
                 'align-items':'stretch',
                 '> *': {
                     'min-width':'0 !important', # avoid overflow due to stubborn elements
-                    '^, > *:only-child': {
-                        'min-height': 'stretch !important',
-                    }, # make single child span full height, useful for backgrounds and nested content without setting class on column itself, (like in writer)
                 },
                 'table': {'width':'calc(100% - 0.5em)'}, # make table full width inside columns with some padding
+                ':only-child:has(.column), .column:only-child': { # strecth column to full height if single parents
+                    'display': 'flex',
+                    'flex-direction': 'column',
+                    'flex': '1 1 100% !important',
+                    'min-height': '0 !important',
+                    'height': '100% !important',
+                    'margin': '0 !important', # must to avoid extra space that causes overflow
+                    'box-sizing': 'border-box !important',
+                }
             },
         },
         'code': {

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/core.py

@@ -128,7 +128,8 @@ class Slides(BaseSlides,metaclass=Singleton):
         - [code! SlideGroup /] can be used to apply batch operations on many slides at once, e.g. [code! Slides[[1,3,5]].vars.update(name='Alice') /].
         - Use indexing with given number to apply persistent effects such as CSS or acess via attributes such as 
           `Slides.s0`, `Slides.s1` etc. for existing slides, so `Slides.s10 == Slides[10,]` if slide with number 10 exists.
-        - Use `[section\! "Backup slides", True \/]` to mark start of supplemental slides. Progress completes before this section and supplemental frames/slides are numbered as `S.1`, `S.2`, ... while remaining navigable.
+        - Use `[section\!! "Backup slides", True \/]` to mark start of supplemental slides. Progress completes before this section and supplemental frames/slides are numbered as `S.1`, `S.2`, ... while remaining navigable.
+        - For functions that accept `width`/`height`, you can use `cqw`/`cqh` CSS units for relative size to current slide, e.g. `image(..., width='50cqw')` will span half the slide width.
     """
 
     @classmethod

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/formatters.py

@@ -151,11 +151,15 @@ def plt2html(plt_fig = None,transparent=True,width = None, caption=None, crop=No
     plt.close(_fig) #AVoids throwing text outside figure
     if width is None:
         width = f'{_fig.get_size_inches()[0]}in'
-    width = (f'width:{width}px' if isinstance(width,int) else f'width:{width}') + ';max-width:100%;' # important to avoid overflow
-    svg = f'<svg style="{width};height:auto;"' + plot_bytes.getvalue().decode('utf-8').split('<svg')[1]
+        
+    props = {
+        'width': f'{width}px' if isinstance(width,int) else f'{width}',
+        'height': 'auto', 'max-width': '100%' # max-width to avoid overflow
+    }
+    svg = f'<svg {_inline_style(props)}' + plot_bytes.getvalue().decode('utf-8').split('<svg')[1]
 
     from .utils import svg as USVG # Avoid circular import
-    return USVG(svg, width=width,crop=crop,caption=caption)
+    return USVG(svg, width=width, crop=crop, caption=caption)
     
 def plt2image(plt_fig=None, transparent=True, width=None, caption=None, format='png', dpi=300):
     """Convert matplotlib figure to image with base64 encoding.

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/pkg_nbs/ips-demo.ipynb

@@ -369,27 +369,34 @@
    "source": [
     "%%slide -1\n",
     "@slides.src\n",
-    "def _(s):\n",
-    "    write(\n",
-    "        \"## Animating Matplotlib!\", \n",
-    "        slides.link('frames-end', 'Skip All Next Frames', icon='arrowr', uid='frames-start')\n",
-    "    )\n",
-    "    \n",
+    "def _(s):    \n",
     "    with slides.code.context(returns = True) as src:\n",
     "        import numpy as np\n",
     "        import matplotlib.pyplot as plt\n",
     "        plots = []  # row list for in place reveal\n",
-    "        for idx in range(10,19):\n",
-    "            _, ax = plt.subplots(figsize=(3.4,2.6))\n",
-    "            x = np.linspace(0,idx,50)\n",
-    "            ax.plot(x,np.sin(x))\n",
-    "            ax.set_title(rf'$f(x)=\\sin(x)$, 0 < x < {idx+1}')\n",
-    "            ax.set_xlim([0,18])\n",
-    "            ax.set_axis_off()\n",
-    "            plots.append(ax)\n",
-    "    # Fixed source at left + row-wise reveals of plots at right.\n",
-    "    write(src, slides.steps(plots), widths=[60,40], paused=True)\n",
-    "    write('Unlike `interact/interactive`, this animation is based on slide frames, all of which are exported to HTML.',css_class='note-tip')"
+    "        x = np.linspace(0, 2 * np.pi, 400)\n",
+    "        for idx in range(1,20):\n",
+    "            fig, ax = plt.subplots(figsize=(3.4, 2))\n",
+    "            y = np.zeros_like(x)\n",
+    "            for n in range(1, idx + 1):\n",
+    "                k = 2 * n - 1\n",
+    "                y += (1 / k) * np.sin(np.pi * k * x)\n",
+    "            y *= (4 / np.pi)\n",
+    "            \n",
+    "            ax.plot(x, y, color='#3b82f6', lw=1)\n",
+    "            ax.axhline(0, alpha=0.75, lw=0.6,ls='dashed')\n",
+    "            ax.set_ylim(-1.9, 1.9)\n",
+    "            ax.axis('off')\n",
+    "            fig.patch.set_facecolor('#111827')\n",
+    "            plots.append(slides.plt2html(fig, caption=f\"Harmonics: {idx}\"))\n",
+    "            \n",
+    "    write([slides.link('frames-end', 'Skip All Next Frames', icon='arrowr', uid='frames-start'), src], \n",
+    "        [\n",
+    "            \"## Animating Matplotlib!\", \n",
+    "            slides.steps(plots, 'bottom',interval=800),\n",
+    "            \"::: block-blue .. [code! steps(plots, 'bottom', interval=800) /]\",\n",
+    "            \"::: note-info .. Only one frame (default last) is exported to PDF/HTML.\",\n",
+    "        ], widths=[60,40])"
    ]
   },
   {

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/pkg_nbs/ips-docs.ipynb

@@ -456,16 +456,14 @@
         "        write('## Adding content on frames incrementally')\n",
         "        slides.frozen(widget := (code := s.get_source()).as_widget()).display()\n",
         "\n",
+        "        @slides.on_load\n",
         "        def highlight_code(slide):\n",
         "            widget.value = code.focus(range(slide.indexf + 1)).value\n",
         "\n",
-        "        slides.on_load(highlight_code)\n",
-        "        slides.pause()\n",
+        "        style='background:var(--bg3-color);margin-block:0.05em !important;'\n",
+        "        slides.pause() # isolate write calls from previous content\n",
         "        for ws, cols in zip([None, (2, 3), None], [(0, 1), (2, 3), (4, 5, 6, 7)]):\n",
-        "            cols = [\n",
-        "                slides.html('h1', f\"{c}\", style='background:var(--bg3-color);margin-block:0.05em !important;')\n",
-        "                for c in cols\n",
-        "            ]\n",
+        "            cols = [slides.html('h1', f\"{c}\", style=style) for c in cols]\n",
         "            write(*cols, widths=ws, css_class='anim-group anim-wipe-right', paused=True) # incremental reveal \n",
         "\n",
         "with slides.slide(16):\n",

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/utils.py

@@ -1101,7 +1101,8 @@ _css_info = (f"""
 @_fix_init_sig
 class steps(ipw.GridBox):
     """A stepper widget to step through given objects with a slider. `objs` should be a list/tuple of objects 
-    to step through and can be any object that can be converted to a widget using `as_widget`. `dots_loc` controls 
+    to step through and can be any object that can be converted to a widget using `as_widget`. Multiple objects
+    in a single step can be given as a nested list/tuple of objects. `dots_loc` controls 
     the location of step dots, which can be 'left', 'top', 'right' or 'bottom'. `interval` controls the time interval 
     in milliseconds for automatic stepping. `css_class` and `css_props` can be used to style the widget.
     `static_index` can be used to set a specific index to be displayed statically in PDF and HTML export, while the stepper will still function normally in the notebook.
@@ -1139,17 +1140,16 @@ class steps(ipw.GridBox):
             display(*outputs) # only clean outputs
             
         first, last = self._sidxs[self._expidx] if self._sidxs else [0, None]
-        self._fixstyle = html('style', _build_css('', {
+        self._fixstyle = html('style', _build_css((), {
                 f'.{self._uclass}': css_props, # apply user css to output
                 '.ips-steps-wrapper > .abs-style': {'position': 'absolute', 'width': '0', 'height': '0', 'padding': '0'}, # take style widgets out of flow
                 ':not(.SlideArea) .ips-steps-output': {'max-height': '400px', 'overflow': 'auto'},
             })).as_widget().add_class('abs-style')
         
-        self._printstyle = html('style', _build_css('', {
-            '@media print': {
-                **view_nodes(f'.{self._uclass} > div > .jp-OutputArea-child',first, last),
-                '.ips-steps-wrapper .steps-widget': {'opacity': '0.2 !important'}, # dim it
-            }})).as_widget().add_class('abs-style').add_class('jupyter-only') # will not export this style to avoid conflicts
+        self._printstyle = html('style', _build_css(('@media print',), {
+            **view_nodes(f'.{self._uclass} > div > .jp-OutputArea-child',first, last),
+            '.ips-steps-wrapper .steps-widget': {'opacity': '0.2 !important'}, # dim it
+        })).as_widget().add_class('abs-style').add_class('jupyter-only') # will not export this style to avoid conflicts
         
         self._stepper = StepSlider(vertical=True if dots_loc in ("left","right") else False, nsteps=len(self._sidxs), interval=interval)
         
@@ -1194,6 +1194,6 @@ class steps(ipw.GridBox):
             slides._send_nav_msg(forward, parts=True, selector=f'.{self._uclass}')
         
         selector = f'.{self._uclass} > div > .jp-OutputArea-child'
-        css = _build_css('', {'@media screen': view_nodes(selector,*idxs)}) # only screen mode to avoid print conflicts
+        css = _build_css(('@media screen',), view_nodes(selector,*idxs)) # only screen mode to avoid print conflicts
         self._viewstyle.value = f"<style>\n{css}\n</style>"
         

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/writer.py

@@ -13,7 +13,7 @@ from IPython.utils.capture import CapturedIO
 from dashlab.utils import _build_css
 
 from .formatters import ipw, XTML, RichOutput, _Output, serializer, htmlize, _inline_style, toc_from_meta, _delim
-from .xmd import BoundXMD, xmd, capture_content, get_slides_instance
+from .xmd import BoundXMD, xmd, capture_content, get_slides_instance, _split_parts
 
 
 class hold:
@@ -134,6 +134,8 @@ class Writer(ipw.HBox):
         
         cols = []
         for i, (w, obj) in enumerate(zip(widths, objs)):
+            if isinstance(obj, str):
+                obj = list(_split_parts(obj, delimited=False)) # split at '++' to support markdown column ~ list of strings
             outputs = obj if isinstance(obj, (list, tuple)) else [obj] # flatten to list of outputs
             cols.append({'flex': f'{w:.3f} {w:.3f} {w*100:.3f}%', 'outputs': outputs})
 
@@ -161,7 +163,7 @@ class Writer(ipw.HBox):
                         display(c)
                     elif isinstance(c, CapturedIO):
                         c.show() # Display captured outputs, all of them
-                    elif isinstance(c,str):
+                    elif isinstance(c, str):
                         xmd(c, returns = False)
                     elif isinstance(c, BoundXMD):
                         c.parse(returns = False) # parse and display extended markdown bounded object
@@ -176,9 +178,7 @@ class Writer(ipw.HBox):
                 raise RuntimeError(f'Error in column {i+1}:\n{cap.stderr}')
 
             # can have last row delimiter, useful for single column automatically dropping last separator
-            base_outputs = list(cap.outputs) 
-            
-            cols[i]['outputs'] = base_outputs
+            cols[i]['outputs'] = list(cap.outputs) 
 
             if paused:
                 for r, out in enumerate(cols[i]['outputs']):
@@ -245,6 +245,7 @@ def write(*objs,widths = None, css_class=None, paused=False, **css_props):
     Write any object that can be displayed in a cell with some additional features:
     
     - Strings will be parsed as as extended markdown that can have citations/python code blocks/Javascript etc. Variables are resolved from notebook scope.
+      A whole column as string will be splitted at '++' to create rows. This is equivalent to list of strings.
     - The output of `xmd.gather` can be passed to parse and display content with user given and scoped variables.
     - Use `paused=True` with rows in columns to reveal content incrementally during frame navigation.
     - Use `slides.steps([...])` for slider-driven step transitions where content is swapped in place.
@@ -272,6 +273,7 @@ def write(*objs,widths = None, css_class=None, paused=False, **css_props):
         - In markdown, `::: columns` maps to static `write(..., paused=False)`, while `::: columns.paused` maps to incremental `write(..., paused=True)`.
         - `::: columns.inline` is inline display mode and ignores incremental framing.
         - Use `++` before `::: columns.paused` to isolate previous content from the first reveal step.
+        - A single object/block with `column` class inside `write`/`::: columns` will stretch to full height of columns no matter how deeply nested it is.
     
     ::: note-tip
         To make a group of rows as single item visually for incremental display purpose, wrap them in a nested list/tuple.

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides/xmd.py

@@ -429,7 +429,7 @@ class XMarkdown(Markdown):
                 outputs.extend(self._parse_block(*obj))  
                 continue # vars are substituted already inside, obj = (header, data)
 
-            for part in self._split_parts(obj, delimited=True):
+            for part in _split_parts(obj, delimited=True):
                 if not isinstance(part, str):
                     outputs.append(part) # Delimiter
                     continue
@@ -466,37 +466,7 @@ class XMarkdown(Markdown):
         content = re.sub(r"(\[load\!.*?\/\])", error(r"Nested loading of files is not supported \1").value, content)
         # after loading content, raise deprecation warning for old syntax instead of silently adopting it.
         content = re.sub(r"(?<![\`\.\\])\bload\[?(.*?)\]?\`([^\`]*)\`", r"[alert! Use [load\! \2 \.. \1 \/] syntax instead! /]", content)
-        return content
-
-    def _split_parts(self, content, delimited=False):
-        "Split content at '++', optionally yielding Delimiter objects."
-        def _part_delim():
-            delim = _delim("PAUSE")
-            if opt == 'isolate':
-                warn("The '[isolate]' option after ++ is deprecated. Use 'columns.paused' directive instead.", name="DeprecationWarning").display()
-            return delim
-        
-        start = 0
-        first = True
-
-        content = textwrap.dedent(content)  # Dedent content before processing to make sure ++ is at start of line
-        for m in _PLUS_RE.finditer(content):
-            opt = (m.group('opt') or '').strip().lower().replace('_', '-')
-            chunk = content[start:m.start()].rstrip() # preserve leading indentation, clear trailing junk
-
-            if chunk:
-                yield chunk
-                if delimited:
-                    yield _part_delim()
-            elif first and delimited:
-                yield _part_delim()
-
-            first = False
-            start = m.end()
-
-        if tail := content[start:].rstrip():
-            yield tail
-    
+        return content    
     
     def _parse_params(self, param_string):
         """Parse parameter string with simple regex."""
@@ -693,8 +663,9 @@ class XMarkdown(Markdown):
             data = self._ignore_incremental(self._fix_legacy_col_sep(data)) # handle legacy mode and ++ separator
             
             if re.search(r'^\-\-\s*$', data, flags=re.MULTILINE): # make columns by optional -- separator
-                _cs = '\n</div>\n<div markdown="1">\n'.join(_stream_chunks(data, sep='--'))
-                data = '\n'.join(['<div markdown="1">', _cs, '</div>']) 
+                data = XTML('<div>' + '</div>\n<div>'.join(
+                    [self._parse_nested(c, returns=True) for c in _stream_chunks(data, sep='--')]
+                ) + '</div>') # wrapping in divs is important otherwise can be so many columns based on parsed content
         
         if tag in CAPTURED_TAGS:
             if tag in STRICT_TAGS: # keep as is from further processing
@@ -713,13 +684,14 @@ class XMarkdown(Markdown):
             _class = f"{_class} {klass}" if _class else klass # add klass
             widths = [float(w) for w in widths]
             widths = [w/(sum(widths) or 1) for w in widths] # allow relative column widths
-            style = '\n'.join(f".{klass} > :nth-child({i+1}) {{flex: {w:.3f} {w:.3f} {100*w:.3f}%;}}" for i, w in enumerate(widths)) # nth-child selectors
-            style += '\n' + f".{klass} > :nth-child({len(widths)}) ~ * {{flex: {min(widths):.3f} {min(widths):.3f} {100*min(widths):.3f}%;}}" # rest all columns get min width
+            style = '\n'.join(f".{klass} > :nth-child({i+1}) {{flex: {w:.3f} {w:.3f} {100*w:.3f}%}}" for i, w in enumerate(widths)) # nth-child selectors
+            style += '\n' + f".{klass} > :nth-child({len(widths)}) ~ * {{flex: {min(widths):.3f} {min(widths):.3f} {100*min(widths):.3f}% !important;}}" # rest all columns get min width
             style = f"<style>.{klass} > p:empty {{display:none;}}\n{style}</style>" # empty p tags should not be treated as columns
             
         # treat tag as class if not given at end
         _class = " ".join([tag, _class])
-        return [XTML(f"<div class='{_class}' {_inline_style(css_props)} {attrs}>{self._parse_nested(data, returns=True)}</div>{style}")]
+        data = data.value if isinstance(data, XTML) else self._parse_nested(data, returns=True) # -- columns parsed already
+        return [XTML(f"<div class='{_class}' {_inline_style(css_props)} {attrs}>{data}</div>{style}")]
     
     def _parse_code(self, data, mode, focus_lines, _class, props, attrs):
         params = inspect.signature(_highlight).parameters.keys()
@@ -808,7 +780,7 @@ class XMarkdown(Markdown):
         cap_cols = []
         for col in cols:
             rows = [] # list to make row-wise parts
-            for row in self._split_parts(col):
+            for row in _split_parts(col):
                 with capture_content() as cap:
                     if self._returns: self._show_disply_error = True # to show error in display var resolution if top level returns
                     try:
@@ -1314,11 +1286,11 @@ class xmd(metaclass=_XMDMeta):
         return XMarkdown()._parse(content, returns=returns, tag=tag)
 
 def _parse_as_steps(markdown):
-    "Parse markdown chunks split by ++ and show alternate chunks through a steps widget."
+    "Parse markdown chunks splitted by -- and show alternate chunks through a steps widget. First chunk is treated as common header and shown always."
     if not isinstance(markdown, str):
         raise TypeError(f"markdown expects a string, got {markdown!r}")
     
-    pages = list(_stream_chunks(markdown, sep='++'))
+    pages = list(_stream_chunks(markdown, sep='--'))
     with capture_content() as cap:
             xmd(pages[0], returns=False) # render common header part
 
@@ -1332,7 +1304,7 @@ def _parse_as_steps(markdown):
 
 
 def _stream_chunks(text, sep='---'):
-    "Used for slides and pages splitting, yields chunks."
+    "Used for slides and pages splitting, yields chunks. Use _split_parts for splitting by ++ more flexibly and yielding delimiter objects."
     s = sep.strip()
     if s.startswith('```'):
         raise ValueError(f"Invalid separator '{s}'. To split by backticks, use re.split instead!")
@@ -1365,3 +1337,34 @@ def _stream_chunks(text, sep='---'):
         if in_block:
             final_chunk += '\n```'  # close unclosed code block in forgiven manner instead of raising error
         yield cmnt_esc.restore(final_chunk)
+        
+
+def _split_parts(content, delimited=False):
+    "Split content at '++', optionally yielding delimiter objects. '++ ' inline is also supported unlinke strict '++' on a line by itself in _stream_chunks."
+    def _part_delim():
+        delim = _delim("PAUSE")
+        if opt == 'isolate':
+            warn("The '[isolate]' option after ++ is deprecated. Use 'columns.paused' directive instead.", name="DeprecationWarning").display()
+        return delim
+    
+    start = 0
+    first = True
+
+    content = textwrap.dedent(content)  # Dedent content before processing to make sure ++ is at start of line
+    for m in _PLUS_RE.finditer(content):
+        opt = (m.group('opt') or '').strip().lower().replace('_', '-')
+        chunk = content[start:m.start()].rstrip() # preserve leading indentation, clear trailing junk
+
+        if chunk:
+            yield chunk
+            if delimited:
+                yield _part_delim()
+        elif first and delimited:
+            yield _part_delim()
+
+        first = False
+        start = m.end()
+
+    if tail := content[start:].rstrip():
+        yield tail
+

{ipyslides-7.3.0 → ipyslides-7.3.2}/ipyslides.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyslides
-Version: 7.3.0
+Version: 7.3.2
 Summary: Live rich content slides in jupyter notebook
 Home-page: https://github.com/asaboor-gh/ipyslides
 Author: Abdul Saboor

ipyslides-7.3.0/ipyslides/__version__.py

@@ -1,2 +0,0 @@
-
-__version__ = "7.3.0"