Improve MDHelper themes and packaging
This commit is contained in:
@@ -39,7 +39,15 @@ class MarkdownRenderer:
|
||||
self.markdown.core.ruler.push("mdhelper_admonitions", self._convert_admonitions)
|
||||
self.markdown.core.ruler.push("mdhelper_task_lists", self._convert_task_lists)
|
||||
|
||||
def render_file(self, markdown_path: Path, theme: str = "light", font_scale: float = 1.0) -> str:
|
||||
def render_file(
|
||||
self,
|
||||
markdown_path: Path,
|
||||
theme: str = "light",
|
||||
font_scale: float = 1.0,
|
||||
document_font_family: str = "",
|
||||
document_font_size: int | None = None,
|
||||
math_engine: str = "katex",
|
||||
) -> str:
|
||||
source = markdown_path.read_text(encoding="utf-8")
|
||||
body = self.markdown.render(source, {"path": str(markdown_path)})
|
||||
return self._wrap_html(
|
||||
@@ -47,10 +55,30 @@ class MarkdownRenderer:
|
||||
title=markdown_path.name,
|
||||
theme=theme,
|
||||
font_scale=font_scale,
|
||||
document_font_family=document_font_family,
|
||||
document_font_size=document_font_size,
|
||||
math_engine=math_engine,
|
||||
)
|
||||
|
||||
def wrap_body_for_display(self, body: str, title: str, theme: str = "light", font_scale: float = 1.0) -> str:
|
||||
return self._wrap_html(body=body, title=title, theme=theme, font_scale=font_scale)
|
||||
def wrap_body_for_display(
|
||||
self,
|
||||
body: str,
|
||||
title: str,
|
||||
theme: str = "light",
|
||||
font_scale: float = 1.0,
|
||||
document_font_family: str = "",
|
||||
document_font_size: int | None = None,
|
||||
math_engine: str = "katex",
|
||||
) -> str:
|
||||
return self._wrap_html(
|
||||
body=body,
|
||||
title=title,
|
||||
theme=theme,
|
||||
font_scale=font_scale,
|
||||
document_font_family=document_font_family,
|
||||
document_font_size=document_font_size,
|
||||
math_engine=math_engine,
|
||||
)
|
||||
|
||||
def _render_fence(
|
||||
self,
|
||||
@@ -61,6 +89,17 @@ class MarkdownRenderer:
|
||||
) -> str:
|
||||
token = tokens[idx]
|
||||
language = token.info.strip().split(maxsplit=1)[0] if token.info else ""
|
||||
normalized_language = language.lower()
|
||||
if normalized_language == "mermaid":
|
||||
return (
|
||||
'<div class="diagram-block">'
|
||||
'<div class="diagram-title">mermaid</div>'
|
||||
f'<pre class="mermaid">{html.escape(token.content)}</pre>'
|
||||
"</div>\n"
|
||||
)
|
||||
if normalized_language in {"math", "tex", "latex"}:
|
||||
return f'<div class="math-block">$$\n{html.escape(token.content)}\n$$</div>\n'
|
||||
|
||||
language_class = f" language-{html.escape(language)}" if language else ""
|
||||
code = self._highlight_code(token.content, language)
|
||||
label = html.escape(language or "text")
|
||||
@@ -148,8 +187,11 @@ class MarkdownRenderer:
|
||||
return self.markdown.renderer.renderToken(tokens, idx, options, env)
|
||||
|
||||
def _resolve_local_media_src(self, src: str, env: dict[str, Any]) -> str:
|
||||
if src.startswith("#"):
|
||||
return src
|
||||
|
||||
parsed = urlsplit(src)
|
||||
if parsed.scheme or parsed.path.startswith("#"):
|
||||
if parsed.scheme:
|
||||
return src
|
||||
|
||||
markdown_path_value = env.get("path")
|
||||
@@ -166,8 +208,11 @@ class MarkdownRenderer:
|
||||
return uri
|
||||
|
||||
def _resolve_local_href(self, href: str, env: dict[str, Any]) -> str:
|
||||
if href.startswith("#"):
|
||||
return href
|
||||
|
||||
parsed = urlsplit(href)
|
||||
if parsed.scheme or parsed.path.startswith("#"):
|
||||
if parsed.scheme:
|
||||
return href
|
||||
|
||||
markdown_path_value = env.get("path")
|
||||
@@ -351,31 +396,106 @@ class MarkdownRenderer:
|
||||
return token
|
||||
return None
|
||||
|
||||
def _wrap_html(self, body: str, title: str, theme: str, font_scale: float) -> str:
|
||||
def _wrap_html(
|
||||
self,
|
||||
body: str,
|
||||
title: str,
|
||||
theme: str,
|
||||
font_scale: float,
|
||||
document_font_family: str,
|
||||
document_font_size: int | None,
|
||||
math_engine: str,
|
||||
) -> str:
|
||||
css = (self.resources_dir / "reader.css").read_text(encoding="utf-8")
|
||||
js = (self.resources_dir / "reader.js").read_text(encoding="utf-8")
|
||||
math_assets = self._math_assets(math_engine)
|
||||
mermaid_script = self._script_tag(self._resource_uri("vendor/mermaid/mermaid.min.js"))
|
||||
pygments_css = HtmlFormatter().get_style_defs(".highlight")
|
||||
escaped_title = html.escape(title)
|
||||
escaped_theme = html.escape(theme, quote=True)
|
||||
font_percent = int(max(0.8, min(font_scale, 1.6)) * 100)
|
||||
escaped_math_engine = html.escape(self._normalized_math_engine(math_engine), quote=True)
|
||||
fallback_font_size = int(round(max(0.8, min(font_scale, 1.6)) * 16))
|
||||
font_size = max(12, min(int(document_font_size or fallback_font_size), 28))
|
||||
font_family = self._css_font_family(document_font_family)
|
||||
escaped_font_family = html.escape(font_family, quote=False)
|
||||
|
||||
return f"""<!doctype html>
|
||||
<html lang="zh-CN" data-theme="{escaped_theme}">
|
||||
<html lang="zh-CN" data-theme="{escaped_theme}" data-math-engine="{escaped_math_engine}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>{escaped_title}</title>
|
||||
<style>
|
||||
:root {{ --reader-font-scale: {font_percent}%; }}
|
||||
:root {{
|
||||
--reader-font-family: {escaped_font_family};
|
||||
--reader-font-size: {font_size}px;
|
||||
}}
|
||||
{pygments_css}
|
||||
{css}
|
||||
</style>
|
||||
{math_assets["css"]}
|
||||
</head>
|
||||
<body>
|
||||
<main class="reader">
|
||||
{body}
|
||||
</main>
|
||||
<script src="qrc:///qtwebchannel/qwebchannel.js"></script>
|
||||
<script>{math_assets["config"]}</script>
|
||||
{math_assets["js"]}
|
||||
{mermaid_script}
|
||||
<script>{js}</script>
|
||||
</body>
|
||||
</html>"""
|
||||
|
||||
def _resource_uri(self, relative_path: str) -> str:
|
||||
path = self.resources_dir / relative_path
|
||||
if not path.exists():
|
||||
return ""
|
||||
return path.as_uri()
|
||||
|
||||
def _script_tag(self, uri: str) -> str:
|
||||
if not uri:
|
||||
return ""
|
||||
return f'<script src="{html.escape(uri, quote=True)}"></script>'
|
||||
|
||||
def _stylesheet_tag(self, uri: str) -> str:
|
||||
if not uri:
|
||||
return ""
|
||||
return f'<link rel="stylesheet" href="{html.escape(uri, quote=True)}">'
|
||||
|
||||
def _css_font_family(self, font_family: str) -> str:
|
||||
name = font_family.strip()
|
||||
if not name:
|
||||
return '"Segoe UI", "Microsoft YaHei UI", "Microsoft YaHei", Arial, sans-serif'
|
||||
escaped_name = name.replace("\\", "\\\\").replace('"', '\\"')
|
||||
return f'"{escaped_name}", "Microsoft YaHei UI", Arial, sans-serif'
|
||||
|
||||
def _math_assets(self, math_engine: str) -> dict[str, str]:
|
||||
normalized = self._normalized_math_engine(math_engine)
|
||||
if normalized == "mathjax":
|
||||
config = (
|
||||
"window.MathJax = {"
|
||||
"tex: {inlineMath: [['$', '$'], ['\\\\(', '\\\\)']], "
|
||||
"displayMath: [['$$', '$$'], ['\\\\[', '\\\\]']], processEscapes: true},"
|
||||
"svg: {fontCache: 'none'}"
|
||||
"};"
|
||||
)
|
||||
return {
|
||||
"css": "",
|
||||
"config": config,
|
||||
"js": self._script_tag(self._resource_uri("vendor/mathjax/tex-svg-full.js")),
|
||||
}
|
||||
|
||||
return {
|
||||
"css": self._stylesheet_tag(self._resource_uri("vendor/katex/katex.min.css")),
|
||||
"config": "",
|
||||
"js": "\n".join(
|
||||
[
|
||||
self._script_tag(self._resource_uri("vendor/katex/katex.min.js")),
|
||||
self._script_tag(self._resource_uri("vendor/katex/auto-render.min.js")),
|
||||
]
|
||||
),
|
||||
}
|
||||
|
||||
def _normalized_math_engine(self, math_engine: str) -> str:
|
||||
return "mathjax" if str(math_engine).lower() == "mathjax" else "katex"
|
||||
|
||||
Reference in New Issue
Block a user