Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
helje5 committed Aug 11, 2021
2 parents 21f20b3 + 394074b commit bbb6f56
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Expand Up @@ -16,7 +16,7 @@ let package = Package(
.package(url : "https://github.com/AlwaysRightInstitute/mustache.git",
from : "1.0.1"),
.package(url : "https://github.com/DoccZz/DocCArchive.git",
from : "0.2.8"),
from : "0.2.9"),
.package(url : "https://github.com/apple/swift-log.git",
from : "1.4.0")
],
Expand Down
15 changes: 15 additions & 0 deletions Sources/DocCHTMLExporter/HTML/ContentHTML.swift
Expand Up @@ -29,6 +29,21 @@ extension DocCArchive.Content {
case .paragraph(let inlineContent):
return "<p>" + inlineContent.generateHTML(in: ctx) + "</p>"

case .orderedList(let items):
var ms = "<ol>"
for item in items {
ms += "<li><p>\(item.content.generateHTML(in: ctx))</p></li>"
}
ms += "</ol>"
return ms
case .unorderedList(let items):
var ms = "<ul>"
for item in items {
ms += "<li><p>\(item.content.generateHTML(in: ctx))</p></li>"
}
ms += "</ul>"
return ms

case .aside(let style, let content):
var ms = "<aside class='\(style.rawValue)'>" // ARIA?
if style == .note { ms += "<p class='label'>Note</p>" }
Expand Down
5 changes: 4 additions & 1 deletion Sources/DocCHTMLExporter/HTML/InlineContentHTML.swift
Expand Up @@ -26,8 +26,11 @@ extension DocCArchive.InlineContent {
case .emphasis(let value):
return "<em>" + value.generateHTML(in: ctx) + "</em>"

case .reference(let identifier, let isActive):
case .reference(let identifier, let isActive,
_ /* let overridingTitle */,
_ /* let overridingTitleInlineContent */):
// e.g. /documentation/SlothCreator/Sloth
// TODO: what to do with the overriding title?
if let ref = ctx.references[identifier.stringValue] {
return ref.generateHTML(isActive: isActive, in: ctx)
}
Expand Down

0 comments on commit bbb6f56

Please sign in to comment.