Skip to content

Commit

Permalink
v2.0.2 code block can be mixed on a slide with other blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinPacker
MartinPacker committed May 3, 2021
1 parent 2a98506 commit e871438
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 123 deletions.
214 changes: 97 additions & 117 deletions md2pptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ try:
except:
have_cairosvg = False

md2pptx_level = "2.0.1"
md2pptx_date = "1 May, 2021"
md2pptx_level = "2.0.2"
md2pptx_date = "3 May, 2021"


class SlideInfo:
Expand Down Expand Up @@ -1264,7 +1264,10 @@ def handleWhateverGraphicType(graphicFilename):
return graphicFilename, printableGraphicFilename


def createCodeSlide(presentation, slideNumber, titleText, code):
def createCodeBlock(presentation, slideNumber, slideInfo, slide, renderingRectangle):
# A variable number of newlines appear before the actual code
code = slideInfo.bodyText.lstrip("\n")

# Figure out code slide type
if code.startswith("<pre"):
codeType = "pre"
Expand All @@ -1275,32 +1278,6 @@ def createCodeSlide(presentation, slideNumber, titleText, code):
else:
codeType = "indented"

if titleText != "":
slide = presentation.slides.add_slide(
presentation.slide_layouts[titleOnlyLayout]
)

# Add title and constrain its size and placement
slideTitleBottom, title, flattenedTitle = formatTitle(
presentation, slide, titleText, pageTitleSize
)

print(str(slideNumber).rjust(4) + " " + flattenedTitle)

else:
print(str(slideNumber).rjust(4) + " " + graphicFilename)

slide = presentation.slides.add_slide(presentation.slide_layouts[blankLayout])

slideTitleBottom = Inches(marginBase)

# Add code

# Get the rectangle the content will draw in
contentLeft, contentWidth, contentTop, contentHeight = getContentRect(
presentation, slide, slideTitleBottom, marginBase
)

# Split the code into lines
codeLines = code.split("\n")

Expand All @@ -1317,7 +1294,10 @@ def createCodeSlide(presentation, slideNumber, titleText, code):
codeLines.pop(-1)

codeBox = slide.shapes.add_textbox(
contentLeft, contentTop, contentWidth, contentHeight
renderingRectangle.left,
renderingRectangle.top,
renderingRectangle.width,
renderingRectangle.height,
)

# Try to control text frame but SHAPE_TO_FIT_TEXT doesn't seem to work
Expand Down Expand Up @@ -1363,7 +1343,9 @@ def createCodeSlide(presentation, slideNumber, titleText, code):
p.font.color.rgb = RGBColor.from_string(codeForeground)

# Adjust code box height based on lines
codeBox.height = min(len(codeLines) * Pt(baseTextSize + 5), contentHeight)
codeBox.height = min(
len(codeLines) * Pt(baseTextSize + 5), renderingRectangle.height
)

# Add code
if codeType == "pre":
Expand Down Expand Up @@ -1518,9 +1500,16 @@ def createAbstractSlide(presentation, slideNumber, titleText, subtitleText, para
return slide


# Unified creation of a table or a content slide
def createContentOrTableSlide(presentation, slideNumber, slideInfo):
# Create the slide
# Unified creation of a table or a code or a content slide
def createContentSlide(presentation, slideNumber, slideInfo):
# slideInfo's body text is only filled in if there is code - and that's
# where the code - plus preamble and postamble is.
if slideInfo.bodyText != "":
haveCode = True
else:
haveCode = False

# Create the slide and check for bullets and/or cards
if (slideInfo.bullets == []) & (slideInfo.cards == []):
slideLayout = titleOnlyLayout
haveBulletsCards = False
Expand All @@ -1529,10 +1518,17 @@ def createContentOrTableSlide(presentation, slideNumber, slideInfo):
haveBulletsCards = True
slide = presentation.slides.add_slide(presentation.slide_layouts[slideLayout])

# Check for table / graphics content
if slideInfo.tableRows == []:
haveTableGraphics = False
else:
haveTableGraphics = True

####################################################################
# At this point haveCode, haveBulletsCards, haveTableGraphics have #
# been appropriately set #
####################################################################

# Add slide title
titleText = slideInfo.titleText
slideTitleBottom, title, flattenedTitle = formatTitle(
Expand All @@ -1550,90 +1546,68 @@ def createContentOrTableSlide(presentation, slideNumber, slideInfo):
)

####################################################################
# Get the dimensions of the rectangle we'll place the graphics in #
# Check whether there are too many elements in the sequence to #
# render - and warn if there are. Then calculate how many to render#
####################################################################
if haveBulletsCards:
# There is some bullets / cards content to render
if haveTableGraphics:
# Have both types of content on one slide
# Split according to percentage of vertical space
allContentSplit = sum(contentSplit)

if contentSplitDirection == "vertical":
# Rectangles are vertically arranged
topHeight = int(contentHeight * contentSplit[0] / allContentSplit)
bottomHeight = int(contentHeight * contentSplit[1] / allContentSplit)

# Top of the content area
topRenderingRectangle = Rectangle(
contentTop, contentLeft, topHeight, contentWidth
)

# bottom of the content area
bottomRenderingRectangle = Rectangle(
int(contentTop + topHeight),
contentLeft,
int(bottomHeight),
contentWidth,
)

if sequence[0] == "table":
tableRenderingRectangle = topRenderingRectangle
bulletsRenderingRectangle = bottomRenderingRectangle
else:
bulletsRenderingRectangle = topRenderingRectangle
tableRenderingRectangle = bottomRenderingRectangle
else:
# Rectangles are horizontally arranged
leftWidth = int(contentWidth * contentSplit[0] / allContentSplit)
rightWidth = int(contentWidth * contentSplit[1] / allContentSplit)
maxBlocks = 2
if len(sequence) > maxBlocks:
print(
"Too many blocks to render. Only " + str(maxBlocks) + " will be rendered."
)
blocksToRender = min(maxBlocks, len(sequence))

# Left of the content area
leftRenderingRectangle = Rectangle(
contentTop, contentLeft, contentHeight, leftWidth
)
####################################################################
# Get the dimensions of the rectangles we'll place the graphics in #
# and their top left corner coordinates
####################################################################
allContentSplit = 0
for b in range(blocksToRender):
allContentSplit = allContentSplit + contentSplit[b]

verticalCursor = contentTop
horizontalCursor = contentLeft

for b in range(blocksToRender):
if contentSplitDirection == "vertical":
# Height and top
blockHeight = int(contentHeight * contentSplit[b] / allContentSplit)
blockTop = verticalCursor
verticalCursor = verticalCursor + blockHeight

# Width and left
blockWidth = contentWidth
blockLeft = contentLeft
else:
# Height and top
blockHeight = contentHeight
blockTop = contentTop

# Right of the content area
rightRenderingRectangle = Rectangle(
contentTop, contentLeft + leftWidth, contentHeight, rightWidth
)
# Width and left
blockWidth = int(contentWidth * contentSplit[b] / allContentSplit)
horizontalCursor = horizontalCursor + blockWidth

if sequence[0] == "table":
tableRenderingRectangle = leftRenderingRectangle
bulletsRenderingRectangle = rightRenderingRectangle
else:
bulletsRenderingRectangle = leftRenderingRectangle
tableRenderingRectangle = rightRenderingRectangle
renderingRectangle = Rectangle(blockTop, blockLeft, blockHeight, blockWidth)

if sequence[b] == "table":
createTableBlock(
presentation, slideNumber, slideInfo, slide, renderingRectangle
)
elif sequence[b] == "list":
createListBlock(
presentation, slideNumber, slideInfo, slide, renderingRectangle
)
else:
# bullets / cards can take up all the content area
bulletsRenderingRectangle = Rectangle(
contentTop, contentLeft, contentHeight, contentWidth
createCodeBlock(
presentation, slideNumber, slideInfo, slide, renderingRectangle
)
else:
# Table / graphics can take up all the content area
tableRenderingRectangle = Rectangle(
contentTop, contentLeft, contentHeight, contentWidth
)

# Populate the slide
if haveTableGraphics:
createTableBlock(
presentation, slideNumber, slideInfo, slide, tableRenderingRectangle
)

if haveBulletsCards:
createContentBlock(
presentation, slideNumber, slideInfo, slide, bulletsRenderingRectangle
)

if want_numbers_content is True:
addFooter(presentation, slideNumber, slide)

return slide


def createContentBlock(presentation, slideNumber, slideInfo, slide, renderingRectangle):
def createListBlock(presentation, slideNumber, slideInfo, slide, renderingRectangle):
# Get bulleted text shape - either for bullets above cards or first card's body shape
bulletsShape = findBodyShape(slide)

Expand Down Expand Up @@ -2661,19 +2635,21 @@ def createSlide(presentation, slideNumber, slideInfo):
slideInfo.bullets,
)
else:
slide = createContentOrTableSlide(
slide = createContentSlide(
presentation,
slideNumber,
slideInfo,
)
elif slideInfo.blockType == "code":
# Note: Somehow two newlines got prepended to the code
slide = createCodeSlide(
presentation, slideNumber, slideInfo.titleText, slideInfo.bodyText[2:]
slide = createContentSlide(
presentation,
slideNumber,
slideInfo,
)

elif slideInfo.blockType == "table":
slide = createContentOrTableSlide(presentation, slideNumber, slideInfo)
slide = createContentSlide(presentation, slideNumber, slideInfo)

slideNumber = slideNumber + 1

Expand Down Expand Up @@ -2701,7 +2677,7 @@ def createTaskSlides(prs, slideNumber, tasks, titleStem):
title = titleStem

slideInfo = SlideInfo(title, "", "table", [], taskRows, [])
slide = createContentOrTableSlide(prs, slideNumber, slideInfo)
slide = createContentSlide(prs, slideNumber, slideInfo)
slideNumber += 1

taskRows = [["Slide", "Due", "Task", "Tags", "Done"]]
Expand Down Expand Up @@ -2732,7 +2708,7 @@ def createTaskSlides(prs, slideNumber, tasks, titleStem):
title = titleStem

slideInfo = SlideInfo(title, "", "table", [], taskRows, [])
slide = createContentOrTableSlide(prs, slideNumber, slideInfo)
slide = createContentSlide(prs, slideNumber, slideInfo)

# Fix up references to be active links to the slide where the task
# was declared
Expand Down Expand Up @@ -2771,7 +2747,7 @@ def createGlossarySlides(prs, slideNumber, abbrevDictionary):
slideInfo = SlideInfo(
title, "", "table", [], glossaryRows, [], ["table"]
)
slide = createContentOrTableSlide(prs, slideNumber, slideInfo)
slide = createContentSlide(prs, slideNumber, slideInfo)

glossarySlides.append(slide)
slideNumber += 1
Expand All @@ -2796,7 +2772,7 @@ def createGlossarySlides(prs, slideNumber, abbrevDictionary):
title = glossaryTitle

slideInfo = SlideInfo(title, "", "table", [], glossaryRows, [], ["table"])
slide = createContentOrTableSlide(prs, slideNumber, slideInfo)
slide = createContentSlide(prs, slideNumber, slideInfo)
glossarySlides.append(slide)
slideNumber += 1

Expand Down Expand Up @@ -2824,7 +2800,7 @@ def createFootnoteSlides(prs, slideNumber, footnoteDefinitions):
title = footnotesTitle

slideInfo = SlideInfo(
title, "", "content", bullets, [], cards, ["bullets"]
title, "", "content", bullets, [], cards, ["list"]
)
slideNumber, slide, sequence = createSlide(prs, slideNumber, slideInfo)

Expand Down Expand Up @@ -2856,7 +2832,7 @@ def createFootnoteSlides(prs, slideNumber, footnoteDefinitions):
# Only one footnotes page
title = footnotesTitle

slideInfo = SlideInfo(title, "", "content", bullets, [], cards, ["bullets"])
slideInfo = SlideInfo(title, "", "content", bullets, [], cards, ["list"])
slideNumber, slide, sequence = createSlide(prs, slideNumber, slideInfo)

footnoteSlides.append(slide)
Expand Down Expand Up @@ -3587,7 +3563,7 @@ for line in linesAfterConcatenation:
inHTMLCode = True

if startswithOneOf(line, ["</pre>", "</code>"]):
inCode = True
inCode = False
inHTMLCode = False

if line.startswith("```"):
Expand All @@ -3601,6 +3577,10 @@ for line in linesAfterConcatenation:
if inCode or inHTMLCode or inFencedCode:
code.append(line)

# If first line of code then mark the current sequence entry as "code"
if len(code) == 1:
sequence.append("code")

if (
(line == "")
& (inCode is True)
Expand Down Expand Up @@ -3945,7 +3925,7 @@ for line in linesAfterConcatenation:
else:
bullets.append([bulletLevel, bulletLine, bulletType])
if inList is False:
sequence.append("bullets")
sequence.append("list")
inList = True
inTable = False

Expand All @@ -3963,7 +3943,7 @@ for line in linesAfterConcatenation:
else:
bullets.append([bulletLevel, bulletLine, bulletType])
if inList is False:
sequence.append("bullets")
sequence.append("list")
inList = True
inTable = False

Expand Down

0 comments on commit e871438

Please sign in to comment.