From 574a7322b3949ac016bed117c13d6b2c14e69f61 Mon Sep 17 00:00:00 2001
From: MartinPacker <martin_packer@uk.ibm.com>
Date: Wed, 17 Jan 2024 20:26:34 +0000
Subject: [PATCH] v4.3.2 Card Video

---
 card.py              |   4 ++
 docs/user-guide.html |  34 +++++++-----
 docs/user-guide.log  |   6 +-
 docs/user-guide.md   |  31 ++++++-----
 docs/user-guide.mdp  |  32 ++++++-----
 md2pptx              | 129 +++++++++++++++++++++++++++----------------
 6 files changed, 145 insertions(+), 91 deletions(-)

diff --git a/card.py b/card.py
index 4943e67..09984a8 100644
--- a/card.py
+++ b/card.py
@@ -21,6 +21,10 @@ def __init__(
         self.graphicTitle = None
         self.printableFilename = None
         
+        self.videoInfo = None
+        self.videoDimensions = None
+        self.videoShape = None
+        
         self.mediaURL = None
         
         self.backgroundShape = None
diff --git a/docs/user-guide.html b/docs/user-guide.html
index 0b10e30..52a031b 100644
--- a/docs/user-guide.html
+++ b/docs/user-guide.html
@@ -1124,7 +1124,7 @@ <h3 id="table-of-contents">Table Of Contents<a class="headerlink" href="#table-o
 </li>
 <li><a href="#card-slides">Card Slides</a><ul>
 <li><a href="#card-titles">Card Titles</a></li>
-<li><a href="#card-graphics">Card Graphics</a></li>
+<li><a href="#card-graphics-&amp;-video">Card Graphics &amp; Video</a></li>
 </ul>
 </li>
 <li><a href="#code-slides">Code Slides</a><ul>
@@ -1484,6 +1484,11 @@ <h2 id="change-log">Change Log<a class="headerlink" href="#change-log" title="Pe
 </thead>
 <tbody>
 <tr>
+<td align="left">4.3.2</td>
+<td align="right">17&nbsp;January&nbsp;2024</td>
+<td align="left">Cards can now have a video where a graphic might be.</td>
+</tr>
+<tr>
 <td align="left">4.3.1</td>
 <td align="right">13&nbsp;January&nbsp;2024</td>
 <td align="left">Card graphics are now clickable and can have tooltips. They can also use <code>data:</code> URL&rsquo;s.</td>
@@ -1491,7 +1496,7 @@ <h2 id="change-log">Change Log<a class="headerlink" href="#change-log" title="Pe
 <tr>
 <td align="left">4.3</td>
 <td align="right">3&nbsp;January&nbsp;2024</td>
-<td align="left">Added card graphics support and <a href="#card-graphic-positioning-cardgraphicposition"><code>CardGraphicPosition</code></a>&comma; <a href="#card-graphic-size-cardgraphicsize"><code>CardGraphicSize</code></a>&comma; and <a href="#card-graphic-padding-cardgraphicpadding"><code>CardGraphicPadding</code></a>.</td>
+<td align="left">Added <a href="#card-graphics-&amp;-video">card graphics</a> support and <a href="#card-graphic-positioning-cardgraphicposition"><code>CardGraphicPosition</code></a>&comma; <a href="#card-graphic-size-cardgraphicsize"><code>CardGraphicSize</code></a>&comma; and <a href="#card-graphic-padding-cardgraphicpadding"><code>CardGraphicPadding</code></a>.</td>
 </tr>
 <tr>
 <td align="left">4.2.1</td>
@@ -2304,9 +2309,10 @@ <h4 id="card-titles">Card Titles<a class="headerlink" href="#card-titles" title=
 </code></pre>
 <p>(See <a href="#card-title-position-cardtitleposition">Card Title Position</a> for more information.)</p>
 <p>You can suppress a title by coding its text value to <code>&amp;nbsp;</code>. If you do this for all the titles on a card slide the space reserved for card titles will be zero. If there are some titles not treated this way the <code>&amp;nbsp;</code>-titled cards will have a gap where the title would have been.</p>
-<h4 id="card-graphics">Card Graphics<a class="headerlink" href="#card-graphics" title="Permanent link"></a></h4>
-<p>You can add graphics to a card. They can be placed in reserved areas before or after the card bulleted list contents.</p>
-<p>Place any graphic declaration between the card&rsquo;s title and the card&rsquo;s contents. For example:</p>
+<p><a id="card-graphics-&-video"></a></p>
+<h4 id="card-graphics-video">Card Graphics &amp; Video<a class="headerlink" href="#card-graphics-video" title="Permanent link"></a></h4>
+<p>You can add a graphic or a video to a card. They can be placed in reserved areas before or after the card bulleted list contents.</p>
+<p>Place any graphic or video declaration between the card&rsquo;s title and the card&rsquo;s contents. For example:</p>
 <pre><code>#### Card One
 
 ![](block.png)
@@ -2314,15 +2320,17 @@ <h4 id="card-graphics">Card Graphics<a class="headerlink" href="#card-graphics"
 * Some content for Card One
   * And some more content
 </code></pre>
-<p>As you can see, the image reference is just a standard Markdown one.</p>
+<p>As you can see, the image reference is just a standard Markdown one. A video reference might be of the form:</p>
+<pre><code>&lt;video height=300 width=400 src="waterdrop.mp4"&gt;&lt;/video&gt;
+</code></pre>
 <p><strong>Notes:</strong></p>
 <ol>
-<li>You must code a non-zero value for <code>CardGraphicSize</code> for graphics to be shown. The default is 0.</li>
-<li>If a card doesn&rsquo;t have a graphic the bulleted list contents can fill the whole of the card (except for any title inside the card).</li>
+<li>You must code a non-zero value for <a href="#card-graphic-size-cardgraphicsize"><code>CardGraphicSize</code></a> for graphics or videos to be shown. The default is 0.</li>
+<li>If a card doesn&rsquo;t have a graphic or a video the bulleted list contents can fill the whole of the card (except for any title inside the card).</li>
 <li>Card graphics can have tooltips and can be clickable. See <a href="#graphics-slides">Graphics Slides</a> for how to code this.</li>
 </ol>
-<h3 id="code-slides">Code Slides<a class="headerlink" href="#code-slides" title="Permanent link"></a></h3>
 <p><a id="code-slides"></a></p>
+<h3 id="code-slides">Code Slides<a class="headerlink" href="#code-slides" title="Permanent link"></a></h3>
 <p>You can create a slide where the body is in a monospace font, without bullets, in a number of different ways:</p>
 <ul>
 <li>Where what you type appears exactly as you typed it - using <code>&lt;code&gt;</code>, triple backticks, or by indentation.</li>
@@ -3570,17 +3578,17 @@ <h5 id="card-graphic-position-cardgraphicposition">Card Graphic Position - <code
 </ol>
 <p><a id="card-graphic-size-cardgraphicsize"></a></p>
 <h5 id="card-graphic-size-cardgraphicsize">Card Graphic Size - <code>CardGraphicSize</code><a class="headerlink" href="#card-graphic-size-cardgraphicsize" title="Permanent link"></a></h5>
-<p>If you want graphics to appear in cards you must specify a non-zero value of <code>CardGraphicSize</code>. For example:</p>
+<p>If you want graphics or videos to appear in cards you must specify a non-zero value of <code>CardGraphicSize</code>. For example:</p>
 <pre><code>cardGraphicSize: 0.75
 </code></pre>
-<p>would cause the graphics to be scaled to fit into a 0.75 inch square.</p>
+<p>would cause the graphics and videos to be scaled to fit into a 0.75 inch square.</p>
 <p>The default is <code>0</code>, that is no graphics.</p>
 <p><a id="card-graphic-padding-cardgraphicpadding"></a></p>
 <h5 id="card-graphic-padding-cardgraphicpadding">Card Graphic Padding - <code>CardGraphicPadding</code><a class="headerlink" href="#card-graphic-padding-cardgraphicpadding" title="Permanent link"></a></h5>
-<p>You can specify space around the graphic on a card. For example:</p>
+<p>You can specify space around the graphic or video on a card. For example:</p>
 <pre><code>cardGraphicPadding: 0.5
 </code></pre>
-<p>will leave a space of 0.5 inches around the graphic. The default is <code>0.1</code>, leaving a 0.1 inch pad around the graphics.</p>
+<p>will leave a space of 0.5 inches around the graphics and videos. The default is <code>0.1</code>, leaving a 0.1 inch pad around them.</p>
 <p><a id="code-metadata"></></p>
 <h4 id="code-metadata">Code Metadata<a class="headerlink" href="#code-metadata" title="Permanent link"></a></h4>
 <p>You can adjust how code slides display their content.</p>
diff --git a/docs/user-guide.log b/docs/user-guide.log
index 23c3ee8..92fd6c8 100644
--- a/docs/user-guide.log
+++ b/docs/user-guide.log
@@ -5,8 +5,8 @@ mdpre Markdown Preprocessor v0.6.7 (17 December, 2023)
 Def mdpre_date = 17 December, 2023
 Def mdpre_level = 0.6.7
 Def userid = martinpacker
-Def time = 16&colon;31
-Def date = 13 January&comma; 2024
+Def time = 20&colon;24
+Def date = 17 January&comma; 2024
 Def TOC = Table Of Contents
 Def md = Markdown
 Def pp = Powerpoint
@@ -44,7 +44,7 @@ CSV Stop
 ..... ..... .....  Multi-Column Table Cells
 ..... .....  Card Slides
 ..... ..... .....  Card Titles
-..... ..... .....  Card Graphics
+..... ..... .....  Card Graphics & Video
 ..... .....  Code Slides
 ..... ..... .....  `<code>`
 ..... ..... .....  Triple Backticks (```)
diff --git a/docs/user-guide.md b/docs/user-guide.md
index df87ac7..41753ab 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -37,7 +37,7 @@ As you can see in the [change log](#change-log), md2pptx is frequently updated -
 		* [Multi-Column Table Cells](#multicolumn-table-cells)
 	* [Card Slides](#card-slides)
 		* [Card Titles](#card-titles)
-		* [Card Graphics](#card-graphics)
+		* [Card Graphics & Video](#card-graphics-&-video)
 	* [Code Slides](#code-slides)
 		* [`<code>`](#<code>)
 		* [Triple Backticks (```)](#triple-backticks-())
@@ -348,8 +348,9 @@ To quote from the python-pptx license statement:
 
 |Level|Date|What|
 |:-|-:|:-|
+|4.3.2|17&nbsp;January&nbsp;2024|Cards can now have a video where a graphic might be.|
 |4.3.1|13&nbsp;January&nbsp;2024|Card graphics are now clickable and can have tooltips. They can also use `data:` URL's.|
-|4.3|3&nbsp;January&nbsp;2024|Added card graphics support and [`CardGraphicPosition`](#card-graphic-positioning-cardgraphicposition)&comma; [`CardGraphicSize`](#card-graphic-size-cardgraphicsize)&comma; and [`CardGraphicPadding`](#card-graphic-padding-cardgraphicpadding).|
+|4.3|3&nbsp;January&nbsp;2024|Added [card graphics](#card-graphics-&-video) support and [`CardGraphicPosition`](#card-graphic-positioning-cardgraphicposition)&comma; [`CardGraphicSize`](#card-graphic-size-cardgraphicsize)&comma; and [`CardGraphicPadding`](#card-graphic-padding-cardgraphicpadding).|
 |4.2.1|28&nbsp;December&nbsp;2023|Made [`backgroundImage`](#specifying-slide-background-images-with-backgroundimage) create **real** slide backgrounds.|
 |4.2|27&nbsp;December&nbsp;2023|Added background image support using [`backgroundImage`](#specifying-slide-background-images-with-backgroundimage).|
 |4.1.2|11&nbsp;July&nbsp;2023|Fixed two bugs: Using `<sub>` &amp; `<sup>` causes a crash. Also [Card Slides](#card-slides) cause a crash.|
@@ -926,11 +927,12 @@ In the above examples the card titles are above the cards. You can specify that
 
 You can suppress a title by coding its text value to `&nbsp;`. If you do this for all the titles on a card slide the space reserved for card titles will be zero. If there are some titles not treated this way the `&nbsp;`-titled cards will have a gap where the title would have been.
 
-#### Card Graphics
+<a id="card-graphics-&-video"></a>
+#### Card Graphics & Video
 
-You can add graphics to a card. They can be placed in reserved areas before or after the card bulleted list contents.
+You can add a graphic or a video to a card. They can be placed in reserved areas before or after the card bulleted list contents.
 
-Place any graphic declaration between the card's title and the card's contents. For example:
+Place any graphic or video declaration between the card's title and the card's contents. For example:
 
     #### Card One
 
@@ -939,17 +941,18 @@ Place any graphic declaration between the card's title and the card's contents.
     * Some content for Card One
       * And some more content
 
-As you can see, the image reference is just a standard Markdown one.
+As you can see, the image reference is just a standard Markdown one. A video reference might be of the form:
+
+    <video height=300 width=400 src="waterdrop.mp4"></video>
 
 **Notes:**
 
-1. You must code a non-zero value for `CardGraphicSize` for graphics to be shown. The default is 0.
-2. If a card doesn't have a graphic the bulleted list contents can fill the whole of the card (except for any title inside the card).
+1. You must code a non-zero value for [`CardGraphicSize`](#card-graphic-size-cardgraphicsize) for graphics or videos to be shown. The default is 0.
+2. If a card doesn't have a graphic or a video the bulleted list contents can fill the whole of the card (except for any title inside the card).
 3. Card graphics can have tooltips and can be clickable. See [Graphics Slides](#graphics-slides) for how to code this.
 
-
-### Code Slides
 <a id="code-slides"></a>
+### Code Slides
 
 You can create a slide where the body is in a monospace font, without bullets, in a number of different ways:
 
@@ -2414,22 +2417,22 @@ causes the graphic to appear after the bulleted list.
 <a id="card-graphic-size-cardgraphicsize"></a>
 ##### Card Graphic Size - `CardGraphicSize`
 
-If you want graphics to appear in cards you must specify a non-zero value of `CardGraphicSize`. For example:
+If you want graphics or videos to appear in cards you must specify a non-zero value of `CardGraphicSize`. For example:
 
     cardGraphicSize: 0.75
 
-would cause the graphics to be scaled to fit into a 0.75 inch square.
+would cause the graphics and videos to be scaled to fit into a 0.75 inch square.
 
 The default is `0`, that is no graphics.
 
 <a id="card-graphic-padding-cardgraphicpadding"></a>
 ##### Card Graphic Padding - `CardGraphicPadding`
 
-You can specify space around the graphic on a card. For example:
+You can specify space around the graphic or video on a card. For example:
 
     cardGraphicPadding: 0.5
 
-will leave a space of 0.5 inches around the graphic. The default is `0.1`, leaving a 0.1 inch pad around the graphics.
+will leave a space of 0.5 inches around the graphics and videos. The default is `0.1`, leaving a 0.1 inch pad around them.
 
 <a id="code-metadata"></>
 #### Code Metadata
diff --git a/docs/user-guide.mdp b/docs/user-guide.mdp
index 42f680e..a2511dd 100644
--- a/docs/user-guide.mdp
+++ b/docs/user-guide.mdp
@@ -154,8 +154,9 @@ To quote from the python-pptx license statement:
 =colalign l r l
 =csv
 Level,Date,What
+4.3.2,17&nbsp;January&nbsp;2024,Cards can now have a video where a graphic might be.
 4.3.1,13&nbsp;January&nbsp;2024,Card graphics are now clickable and can have tooltips. They can also use `data:` URL's.
-4.3,3&nbsp;January&nbsp;2024,Added card graphics support and [`CardGraphicPosition`](#card-graphic-positioning-cardgraphicposition)&comma; [`CardGraphicSize`](#card-graphic-size-cardgraphicsize)&comma; and [`CardGraphicPadding`](#card-graphic-padding-cardgraphicpadding).
+4.3,3&nbsp;January&nbsp;2024,Added [card graphics](#card-graphics-&-video) support and [`CardGraphicPosition`](#card-graphic-positioning-cardgraphicposition)&comma; [`CardGraphicSize`](#card-graphic-size-cardgraphicsize)&comma; and [`CardGraphicPadding`](#card-graphic-padding-cardgraphicpadding).
 4.2.1,28&nbsp;December&nbsp;2023,Made [`backgroundImage`](#specifying-slide-background-images-with-backgroundimage) create **real** slide backgrounds.
 4.2,27&nbsp;December&nbsp;2023,Added background image support using [`backgroundImage`](#specifying-slide-background-images-with-backgroundimage).
 4.1.2,11&nbsp;July&nbsp;2023,Fixed two bugs: Using `<sub>` &amp; `<sup>` causes a crash. Also [Card Slides](#card-slides) cause a crash.
@@ -808,12 +809,13 @@ You can suppress a title by coding its text value to `&nbsp;`. \
 If you do this for all the titles on a card slide the space reserved for card titles will be zero. \
 If there are some titles not treated this way the `&nbsp;`-titled cards will have a gap where the title would have been.
 
-#### Card Graphics
+<a id="card-graphics-&-video"></a>
+#### Card Graphics & Video
 
-You can add graphics to a card. \
+You can add a graphic or a video to a card. \
 They can be placed in reserved areas before or after the card bulleted list contents.
 
-Place any graphic declaration between the card's title and the card's contents. \
+Place any graphic or video declaration between the card's title and the card's contents. \
 For example:
 
     #### Card One
@@ -823,19 +825,21 @@ For example:
     * Some content for Card One
       * And some more content
 
-As you can see, the image reference is just a standard Markdown one.
+As you can see, the image reference is just a standard Markdown one. \
+A video reference might be of the form:
+
+    <video height=300 width=400 src="waterdrop.mp4"></video>
 
 **Notes:** 
 
-1. You must code a non-zero value for `CardGraphicSize` for graphics to be shown. \
+1. You must code a non-zero value for [`CardGraphicSize`](#card-graphic-size-cardgraphicsize) for graphics or videos to be shown. \
 The default is 0.
-2. If a card doesn't have a graphic the bulleted list contents can fill the whole of the card (except for any title inside the card).
+2. If a card doesn't have a graphic or a video the bulleted list contents can fill the whole of the card (except for any title inside the card).
 3. Card graphics can have tooltips and can be clickable. \
 See [Graphics Slides](#graphics-slides) for how to code this.
 
-
-### Code Slides
 <a id="code-slides"></a>
+### Code Slides
 
 You can create a slide where the body is in a monospace font, without bullets, in a number of different ways:
 
@@ -2455,25 +2459,25 @@ and specifying graphics instead.
 <a id="card-graphic-size-cardgraphicsize"></a>
 ##### Card Graphic Size - `CardGraphicSize`
 
-If you want graphics to appear in cards you must specify a non-zero value of `CardGraphicSize`. \
+If you want graphics or videos to appear in cards you must specify a non-zero value of `CardGraphicSize`. \
 For example:
 
     cardGraphicSize: 0.75
 
-would cause the graphics to be scaled to fit into a 0.75 inch square.
+would cause the graphics and videos to be scaled to fit into a 0.75 inch square.
 
 The default is `0`, that is no graphics.
 
 <a id="card-graphic-padding-cardgraphicpadding"></a>
 ##### Card Graphic Padding - `CardGraphicPadding`
 
-You can specify space around the graphic on a card. \
+You can specify space around the graphic or video on a card. \
 For example:
 
     cardGraphicPadding: 0.5
 
-will leave a space of 0.5 inches around the graphic. The default is `0.1`, \
-leaving a 0.1 inch pad around the graphics.
+will leave a space of 0.5 inches around the graphics and videos. The default is `0.1`, \
+leaving a 0.1 inch pad around them.
 
 <a id="code-metadata"></>
 #### Code Metadata
diff --git a/md2pptx b/md2pptx
index 69d9ce4..cea6f76 100755
--- a/md2pptx
+++ b/md2pptx
@@ -80,8 +80,8 @@ except:
     have_graphviz = False
 
 
-md2pptx_level = "4.3.1+"
-md2pptx_date = "14 January, 2024"
+md2pptx_level = "4.3.2"
+md2pptx_date = "17 January, 2024"
 
 namespaceURL = {
     "mc":  "http://schemas.openxmlformats.org/markup-compatibility/2006",
@@ -1046,7 +1046,7 @@ def getGraphicDimensions(fname):
         return -1, -1
 
 
-def getVideoDimensionsPlus(audioVideoInfo):
+def getVideoInfo(audioVideoInfo):
     if audioVideoInfo.source.find("://") > -1:
         # Video would be sourced from the web
         try:
@@ -2708,7 +2708,7 @@ def createListBlock(slideInfo, slide, renderingRectangle):
     cardColours = processingOptions.getCurrentOption("cardcolour")
     cardDividerColour = processingOptions.getCurrentOption("carddividercolour")
     cardGraphicSize = processingOptions.getCurrentOption("cardgraphicsize")
-    cardGraphicPosition = processingOptions.getCurrentOption("cardgraphicposition")
+    cardGraphicPosition = processingOptions.getCurrentOption("cardGraphicPosition")
     cardGraphicPadding = int(Inches(processingOptions.getCurrentOption("cardgraphicpadding")))
     marginBase = processingOptions.getCurrentOption("marginBase")
     pageTitleSize = processingOptions.getCurrentOption("pageTitleSize")
@@ -2860,11 +2860,11 @@ def createListBlock(slideInfo, slide, renderingRectangle):
             card.titleShape = cardTitleShape
 
             if (cardGraphicFilename := card.graphic) != "":
-                # This card has a graphic so save its name
+                # This card has a graphic so get its name
                 card.graphicDimensions = getGraphicDimensions(cardGraphicFilename)
 
                 # Create card graphic shape - to be resized later
-                cardGraphicShape = slide.shapes.add_picture(
+                card.graphicShape = slide.shapes.add_picture(
                     cardGraphicFilename,
                     Inches(0),
                     Inches(0),
@@ -2881,16 +2881,29 @@ def createListBlock(slideInfo, slide, renderingRectangle):
                         graphicTitle = card.graphicTitle
 
                     pictureInfos.append(
-                        (cardGraphicShape, mediaURL, graphicTitle)
+                        (card.graphicShape, mediaURL, graphicTitle)
                     )
 
+            elif (cardVideoInfo := card.videoInfo) is not None:
+                # This card has a video so get its dimensions etc
+                card.videoDimensions = getVideoInfo(cardVideoInfo)
+
+                # Create card video shape - to be resized later
+                card.videoShape = slide.shapes.add_movie(
+                    card.videoInfo.source,
+                    Inches(0),
+                    Inches(0),
+                    Inches(0),
+                    Inches(0),
+                    None
+                )
+            
+                reportGraphicFilenames(card.printableFilename)
+                
             else:
-                cardGraphicShape = None
+                # Some of this is probably not needed
                 card.graphicDimensions = None
-
-            # Add the card graphic's shape to the list - or None if this card
-            # doesn't have a graphic
-            card.graphicShape = cardGraphicShape
+                card.videoDimensions = None
 
             # Clear text from cloned title and add in the title text
             cardTitleShape.text_frame.paragraphs[0].text = ""
@@ -3003,12 +3016,17 @@ def createListBlock(slideInfo, slide, renderingRectangle):
         cardTitleShape = card.titleShape
         cardBodyShape = card.bodyShape
         cardGraphicShape = card.graphicShape
+        cardVideoShape = card.videoShape
 
         # Get dimensions of any graphic
-        if cardGraphicShape is not None:
-            cardGraphicNativeWidth, cardGraphicNativeHeight = card.graphicDimensions
+        if cardGraphicShape is not None :
+            cardMediaNativeWidth, cardMediaNativeHeight = card.graphicDimensions
+
+        elif cardVideoShape is not None:
+            cardMediaNativeWidth, cardMediaNativeHeight, _, _ = card.videoDimensions
+
         else:
-            cardGraphicNativeWidth, cardGraphicNativeHeight = (0, 0)
+            cardMediaNativeWidth, cardMediaNativeHeight = (0, 0)
 
         # Set the card shapes' width
         cardBackgroundShape.width = cardWidth
@@ -3081,14 +3099,14 @@ def createListBlock(slideInfo, slide, renderingRectangle):
             dividingLine.line.width = Pt(2.0)
 
         # Position card body shape
-        if cardGraphicShape == None:
+        if (cardGraphicShape == None) & (cardVideoShape == None):
             # No graphic on this card
             cardBodyShape.top = card.bodyTop
             cardBodyShape.height = cardBodyHeight
             cardBodyShape.left = card.left
             cardBodyShape.width = cardWidth
         else:
-            # Make room for graphic
+            # Make room for graphic or video
             if cardGraphicPosition == "before":
                 # Graphic before
                 if cardLayout == "horizontal":
@@ -3117,46 +3135,51 @@ def createListBlock(slideInfo, slide, renderingRectangle):
             else:
                 cardBodyShape.height = cardBodyHeight
 
-            # Scale graphic
-            (cardPicWidth, cardPicHeight, scaledByHeight) = scalePicture(
+            # Scale graphic or video
+            (cardMediaWidth, cardMediaHeight, scaledByHeight) = scalePicture(
                 cardGraphicSizeRaw,
                 cardGraphicSizeRaw,
-                cardGraphicNativeWidth,
-                cardGraphicNativeHeight,
+                cardMediaNativeWidth,
+                cardMediaNativeHeight,
             )
+            
+            if cardGraphicShape is not None:
+                cardMediaShape = cardGraphicShape
+            else:
+                cardMediaShape = cardVideoShape
 
             # Vertically position graphic shape
             if cardGraphicPosition == "before":
                 # Graphic before card text
                 if cardLayout == "horizontal":
-                    cardGraphicShape.top = cardTitleShape.top + cardGraphicPadding + \
-                        cardTitleShape.height + int((cardGraphicSizeRaw - cardPicHeight) / 2)
+                    cardMediaShape.top = cardTitleShape.top + cardGraphicPadding + \
+                        cardTitleShape.height + int((cardGraphicSizeRaw - cardMediaHeight) / 2)
                 else:
-                    cardGraphicShape.top = cardBodyShape.top + \
-                        int((cardBodyHeight - cardGraphicSizeRaw) / 2)
+                    cardMediaShape.top = cardBodyShape.top + \
+                        int((cardBodyHeight - cardMediaHeight) / 2)
             else:
                 # Graphic after card text
                 if cardLayout == "horizontal":
-                    cardGraphicShape.top = cardBodyShape.height + cardBodyShape.top + \
+                    cardMediaShape.top = cardBodyShape.height + cardBodyShape.top + \
                         cardGraphicPadding
                 else:
-                    cardGraphicShape.top = cardBodyShape.top + \
+                    cardMediaShape.top = cardBodyShape.top + \
                         int((cardBodyHeight - cardGraphicSizeRaw) / 2)
 
             # Horizontally position card graphic shape
             if cardLayout == "horizontal":
-                cardGraphicShape.left = cardTitleShape.left + \
-                    int((cardTitleShape.width - cardPicWidth) / 2)
+                cardMediaShape.left = cardTitleShape.left + \
+                    int((cardTitleShape.width - cardMediaWidth) / 2)
             else:
                 if cardGraphicPosition == "before":
-                    cardGraphicShape.left = card.left + cardGraphicPadding
+                    cardMediaShape.left = card.left + cardGraphicPadding
                 else:
-                    cardGraphicShape.left = card.left + cardBodyShape.width + \
+                    cardMediaShape.left = card.left + cardBodyShape.width + \
                         cardGraphicPadding
 
             # Set dimensions of card graphic shape
-            cardGraphicShape.width = int(cardPicWidth)
-            cardGraphicShape.height = int(cardPicHeight)
+            cardMediaShape.width = int(cardMediaWidth)
+            cardMediaShape.height = int(cardMediaHeight)
 
         # Render any card body text
         if card.bullets != "":
@@ -3335,7 +3358,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
                 topLeftMediaHeight,
                 topLeftVideoType,
                 topLeftVideoData,
-            ) = getVideoDimensionsPlus(topLeftVideo)
+            ) = getVideoInfo(topLeftVideo)
 
             if topLeftMediaWidth == -1:
                 if gridRows == 2:
@@ -3374,7 +3397,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
                     topRightMediaHeight,
                     topRightVideoType,
                     topRightVideoData,
-                ) = getVideoDimensionsPlus(topRightVideo)
+                ) = getVideoInfo(topRightVideo)
 
                 if topRightMediaWidth == -1:
                     if gridRows == 2:
@@ -3409,7 +3432,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
                     bottomLeftMediaHeight,
                     bottomLeftVideoType,
                     bottomLeftVideoData,
-                ) = getVideoDimensionsPlus(bottomLeftVideo)
+                ) = getVideoInfo(bottomLeftVideo)
 
                 if bottomLeftMediaWidth == -1:
                     if gridRows == 2:
@@ -3447,7 +3470,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
                         bottomRightMediaHeight,
                         bottomRightVideoType,
                         bottomRightVideoData,
-                    ) = getVideoDimensionsPlus(bottomRightVideo)
+                    ) = getVideoInfo(bottomRightVideo)
 
                     if bottomRightMediaWidth == -1:
                         if gridRows == 2:
@@ -3540,7 +3563,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
         elif topLeftVideo is not None:
             if topLeftVideoType == "Local":
                 # Can use local file directly
-                topLeftVideo = slide.shapes.add_movie(
+                topLeftVideoShape = slide.shapes.add_movie(
                     topLeftVideo.source,
                     topLeftPicX,
                     topLeftPicY,
@@ -3616,7 +3639,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
             elif topRightVideo is not None:
                 if topRightVideoType == "Local":
                     # Can use local file directly
-                    topRightVideo = slide.shapes.add_movie(
+                    topRightVideoShape = slide.shapes.add_movie(
                         topRightVideo.source,
                         topRightPicX,
                         topRightPicY,
@@ -3706,7 +3729,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
             elif bottomLeftVideo is not None:
                 if bottomLeftVideoType == "Local":
                     # Can use local file directly
-                    bottomLeftVideo = slide.shapes.add_movie(
+                    bottomLeftVideoShape = slide.shapes.add_movie(
                         bottomLeftVideo.source,
                         bottomLeftPicX,
                         bottomLeftPicY,
@@ -3796,7 +3819,7 @@ def createTableBlock(slideInfo, slide, renderingRectangle, tableBlockNumber):
                 elif bottomRightVideo is not None:
                     if bottomRightVideoType == "Local":
                         # Can use local file directly
-                        bottomRightVideo = slide.shapes.add_movie(
+                        bottomRightVideoShape = slide.shapes.add_movie(
                             bottomRightVideo.source,
                             bottomRightPicX,
                             bottomRightPicY,
@@ -5522,12 +5545,12 @@ for line in metadata_lines:
                 f'CardTitlePosition value \'{value}\' unsupported. "inside", "above", "before", or "after" required.'
             )
 
-    elif name == "cardgraphicposition":
+    elif name == "cardGraphicPosition":
         if value in ["before", "after"]:
             processingOptions.setOptionValues(name, value)
         else:
             print(
-                f'CardGraphicPosition value \'{value}\' unsupported. "before",or "after" required.'
+                f'cardGraphicPosition value \'{value}\' unsupported. "before",or "after" required.'
             )
 
     elif name == "cardtitlealign":
@@ -6180,7 +6203,7 @@ for lineNumber, line in enumerate(linesAfterConcatenation):
                         metadataKey, metadataValue, ""
                     )
 
-                elif metadataKey == "cardgraphicposition":
+                elif metadataKey == "cardGraphicPosition":
                     # Card graphic position - before or after
                     processingOptions.dynamicallySetOption(
                         metadataKey, metadataValue, ""
@@ -6585,9 +6608,21 @@ for lineNumber, line in enumerate(linesAfterConcatenation):
                     ) = handleWhateverGraphicType(clickableGraphicMatch.group(2))
                     
                     cards[-1].mediaURL = clickableGraphicMatch.group(3)
+
+                elif videoRegexMatch := videoRegex.match(line):
+                    (
+                        _ ,
+                        _ ,
+                        cards[-1].printableFilename,
+                        _ ,
+                        _ ,
+                        cards[-1].videoInfo,
+                        _ ,
+                    ) = parseMedia(videoRegexMatch.group(0), 0)
+
                 else:
-                    # Might implement these later on
-                    print("video and audio not supported")
+                    # Might implement this later on
+                    print("Audio not supported")
 
             else:
                 # Cell contains a non-clickable graphic
@@ -6976,4 +7011,4 @@ for slide in prs.slides:
     exec(script)
 
 
-sys.exit()
+sys.exit()
\ No newline at end of file