Add support for row- and column-span in tables #385
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
QuietMisdreavus
requested review from
mportiz08,
ethan-kusters and
dobromir-hristov
|
@swift-ci Please test |
3 tasks
d-ronnqvist
reviewed
Sep 21, 2022
Sources/SwiftDocC/Model/Rendering/Content/RenderBlockContent.swift
Outdated
Show resolved
Hide resolved
d-ronnqvist
approved these changes
Sep 21, 2022
QuietMisdreavus
force-pushed
the
table-spans
branch
from
ba5e33c to
6334034
Compare
|
@swift-ci Please test |
`extendedData` provides supplementary per-cell data for tables. It's indexed with a generated string key with the format 'X_Y', as described in its "description" field. For the most part this can be omitted, but here it introduces the 'colspan' and 'rowspan' properties, with the following semantics: - the default value of each of these is 1. the property will be absent in this case. - if all values in an `extendedData` object are the default, it will not be included in the Render JSON. - a value greater than one has the same semantic meaning as the attributes of the same name on the HTML `tr`/`th` elements - that this cell should fill in the space of more than one column and/or row. - a value of zero means that the cell should not be rendered in HTML because another cell has a span that overwrites it.
rdar://98017880
…ation Co-Authored-By: David Rönnqvist <[email protected]>
QuietMisdreavus
force-pushed
the
table-spans
branch
from
6334034 to
a1731ab
Compare
|
Rebased. @swift-ci Please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bug/issue #, if applicable: rdar://98017880
Summary
This PR loads the new Markdown support for row- and column- span in tables and emits it in Render JSON. For more information about the Markdown syntax, see the swift-cmark PR linked below.
Dependencies
Testing
Use the following sample Markdown to test the new feature:
Steps:
distdirectory to theDOCC_HTML_DIRenvironment variable.swift run docc preview Sources/SwiftDocC/SwiftDocC.docc --fallback-display-name SwiftDocC --fallback-bundle-identifier org.swift.SwiftDocC --fallback-bundle-version 1.0.0Checklist
Make sure you check off the following items. If they cannot be completed, provide a reason.
./bin/testscript and it succeeded