修改分页问题
This commit is contained in:
@@ -197,7 +197,9 @@ enum RDEPUBTextRendererSupport {
|
||||
baseURL: URL?,
|
||||
style: RDEPUBTextRenderStyle,
|
||||
resourceResolver: RDEPUBResourceResolver?,
|
||||
contentLanguageCode: String? = nil
|
||||
contentLanguageCode: String? = nil,
|
||||
pageSize: CGSize? = nil,
|
||||
layoutConfig: RDEPUBTextLayoutConfig? = nil
|
||||
) -> RDEPUBTextChapterRenderRequest {
|
||||
let normalizedHTML = injectPaginationSemanticMarkers(into: normalizeHTML(rawHTML))
|
||||
let stylesheetHrefReplacements = inlineLinkedStyleSheets(
|
||||
@@ -255,7 +257,12 @@ enum RDEPUBTextRendererSupport {
|
||||
stylesheet: RDEPUBTextStyleSheetPackage(layers: layers),
|
||||
resourceDiagnostics: resourceDiagnostics
|
||||
)
|
||||
return RDEPUBTextChapterRenderRequest(context: context, style: style)
|
||||
return RDEPUBTextChapterRenderRequest(
|
||||
context: context,
|
||||
style: style,
|
||||
pageSize: pageSize,
|
||||
layoutConfig: layoutConfig
|
||||
)
|
||||
}
|
||||
|
||||
/// HTML 规范化:清理冗余字符(CR、多余换行),规范化附件 HTML 标记
|
||||
@@ -285,15 +292,20 @@ enum RDEPUBTextRendererSupport {
|
||||
#if canImport(DTCoreText)
|
||||
static func prepareHTMLElementForReaderRendering(
|
||||
_ element: DTHTMLElement,
|
||||
style: RDEPUBTextRenderStyle
|
||||
style: RDEPUBTextRenderStyle,
|
||||
maxImageSize: CGSize? = nil
|
||||
) {
|
||||
guard let attachment = element.textAttachment else { return }
|
||||
let pointSize = max(element.fontDescriptor.pointSize, style.font.pointSize)
|
||||
let maxSize = CGSize(
|
||||
let fallbackSize = CGSize(
|
||||
width: round(UIScreen.main.bounds.insetBy(dx: 20, dy: 28).width),
|
||||
height: round(UIScreen.main.bounds.insetBy(dx: 20, dy: 28).height * 0.85)
|
||||
)
|
||||
normalizeAttachmentLayoutForWXRead(attachment, fontPointSize: pointSize, maxImageSize: maxSize)
|
||||
normalizeAttachmentLayoutForWXRead(
|
||||
attachment,
|
||||
fontPointSize: pointSize,
|
||||
maxImageSize: maxImageSize ?? fallbackSize
|
||||
)
|
||||
if isFootnoteAttachment(attachment) {
|
||||
element.displayStyle = .inline
|
||||
} else if isCoverAttachment(attachment) {
|
||||
@@ -390,6 +402,38 @@ enum RDEPUBTextRendererSupport {
|
||||
private static func normalizeAttachmentHTMLMarkers(in html: String) -> String {
|
||||
var normalized = html
|
||||
|
||||
if let bodyPicContainerRegex = try? NSRegularExpression(
|
||||
pattern: #"<div\b([^>]*class\s*=\s*["'][^"']*\b(?:qrbodyPic|bodyPic)\b[^"']*["'][^>]*)>([\s\S]*?)</div>"#,
|
||||
options: [.caseInsensitive]
|
||||
) {
|
||||
normalized = replaceMatches(
|
||||
using: bodyPicContainerRegex,
|
||||
in: normalized
|
||||
) { tag in
|
||||
guard let imageTagRegex = try? NSRegularExpression(pattern: #"<img\b[^>]*>"#, options: [.caseInsensitive]) else {
|
||||
return tag
|
||||
}
|
||||
|
||||
return replaceMatches(
|
||||
using: imageTagRegex,
|
||||
in: tag
|
||||
) { imageTag in
|
||||
mergeHTMLAttributes(
|
||||
into: imageTag,
|
||||
requiredClass: "bodyPic",
|
||||
styleFragments: [
|
||||
"wr-vertical-center-style:2",
|
||||
"max-width:100%",
|
||||
"height:auto",
|
||||
"display:block",
|
||||
"margin-left:auto",
|
||||
"margin-right:auto"
|
||||
]
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let footnoteRegex = try? NSRegularExpression(
|
||||
pattern: #"<img\b([^>]*class\s*=\s*["'][^"']*\bqqreader-footnote\b[^"']*["'][^>]*)>"#,
|
||||
options: [.caseInsensitive]
|
||||
|
||||
Reference in New Issue
Block a user