{html.escape(title)}
') if options.include_metadata: @@ -145,6 +165,17 @@ class HtmlExporter: def _render_paragraph(self, node: DocumentNode, warnings: list[str]) -> str: return f"{self._render_children(node.children, warnings)}
" + def _render_callout(self, node, warnings): + kind = node.attributes['kind'] + title = self._render_children(node.children[0].children,warnings) + icon = html.escape(CALLOUTS[kind][0]) + body = self._render_children(node.children[1:],warnings) + heading = f' {title}' + if node.attributes.get('fold'): + opened = ' open' if node.attributes['fold'] == '+' else '' + return f'{heading}
{body}
{self._render_children(node.children, warnings)}" diff --git a/backend/app/export/exporters/pdf.py b/backend/app/export/exporters/pdf.py index e15f742..2f44d22 100644 --- a/backend/app/export/exporters/pdf.py +++ b/backend/app/export/exporters/pdf.py @@ -19,6 +19,7 @@ from reportlab.pdfbase import pdfmetrics from reportlab.pdfbase.cidfonts import UnicodeCIDFont from reportlab.platypus import ( Paragraph, + Indenter, Preformatted, SimpleDocTemplate, Spacer, @@ -28,6 +29,7 @@ from reportlab.platypus import ( from reportlab.platypus.flowables import HRFlowable from app.contracts import ExportOptions +from app.export.themes import CALLOUTS, print_theme_warning from app.export.document import Document, DocumentNode, ExportResult from app.export.exporters._common import ( MERMAID_WARNING, @@ -119,6 +121,7 @@ class PdfExporter: """同步渲染；CPU 密集，调用方应放入线程执行，避免阻塞事件循环。""" self._styles = _make_styles() warnings: list[str] = [] + print_theme_warning(options, warnings, "PDF") page = _PAGE_SIZES.get((options.page_size or "A4").lower(), A4) self._options = options @@ -180,6 +183,15 @@ class PdfExporter: def _block_paragraph(self, node: DocumentNode, story: list, warnings: list[str]) -> None: story.append(Paragraph(self._render_inline(node.children, warnings), self._styles["body"])) + def _block_callout(self, node, story, warnings): + kind = node.attributes['kind'] + icon, color = CALLOUTS[kind] + title = self._render_inline(node.children[0].children,warnings) + style = ParagraphStyle('callout-'+kind,parent=self._styles['body'],textColor=color, + backColor='#f6f8fa',borderColor=color,borderWidth=1,borderPadding=6,spaceBefore=8,spaceAfter=8) + story.append(Paragraph(_html.escape(icon)+' '+title,style)) + self._render_children(node.children[1:],story,warnings) + def _block_blockquote(self, node: DocumentNode, story: list, warnings: list[str]) -> None: # 引用块的直接子节点是块级节点（paragraph/list 等），不能交给行内渲染器， # 否则正文会被当作「无法表示的行内节点」丢弃；逐个渲染并继承引用缩进/颜色。 @@ -251,6 +263,12 @@ class PdfExporter: self._block_list(child, story, warnings, indent + 14, color) elif child.type == "paragraph": parts.append(self._render_inline(child.children, warnings)) + elif hasattr(self, f"_block_{child.type}"): + flush() + # Keep block content inside the list frame, including tables and callouts. + story.append(Indenter(left=indent)) + self._render_block(child, story, warnings) + story.append(Indenter(left=-indent)) else: parts.append(self._render_inline_node(child, warnings)) flush() diff --git a/backend/app/export/markdown.py b/backend/app/export/markdown.py index bf9934d..436ebda 100644 --- a/backend/app/export/markdown.py +++ b/backend/app/export/markdown.py @@ -8,6 +8,10 @@ from __future__ import annotations import mistune +from mistune.plugins.table import table_in_list, table_in_quote +import re +from copy import deepcopy +from app.export.themes import CALLOUTS, ALIASES from app.export.document import Document, DocumentNode @@ -21,6 +25,8 @@ _FUNCTION_PLOT_LANGS = {"function-plot", "function_plot", "functionplot"} def parse_document(markdown: str) -> Document: """把 Markdown 文本解析为 Document AST 根节点。""" renderer = mistune.create_markdown(renderer="ast", plugins=_PLUGINS) + table_in_quote(renderer) + table_in_list(renderer) tokens = renderer(markdown) mapper = _AstMapper() return Document(node_id=mapper.next_id(), children=mapper.map_blocks(tokens)) @@ -70,6 +76,28 @@ class _AstMapper: if kind == "block_code": return self._map_code(token) if kind == "block_quote": + children = deepcopy(token.get('children', [])) + first = children[0] if children else {} + inline = first.get('children', []) + if first.get('type') == 'paragraph' and inline and inline[0].get('type') == 'text': + match = re.match(r'^\[!([\w-]+)\]([+-]?)[ \t]*', inline[0].get('raw', '')) + if match: + name = match[1].lower() + name = ALIASES.get(name, name) + if name not in CALLOUTS: + name = 'note' + inline[0]['raw'] = inline[0]['raw'][match.end():] + split = next((i for i,t in enumerate(inline) if t['type'] in ('softbreak','linebreak')),len(inline)) + title = inline[:split] + if not any(t.get('raw') or t.get('children') for t in title): + title = [{'type':'text','raw':match[1].lower().capitalize()}] + first['children'] = inline[split+1:] + if not first['children']: + children.pop(0) + heading = DocumentNode(type='paragraph',node_id=self.next_id(),children=self.map_inline(title)) + return DocumentNode(type='callout',node_id=self.next_id(), + attributes={'kind':name,'fold':match[2]}, + children=[heading,*self.map_blocks(children)]) return DocumentNode( type="blockquote", node_id=self.next_id(), diff --git a/backend/app/export/themes.py b/backend/app/export/themes.py new file mode 100644 index 0000000..94e07ee --- /dev/null +++ b/backend/app/export/themes.py @@ -0,0 +1,33 @@ +"""Export palettes are fixed data; arbitrary theme CSS is never executed.""" +PALETTES = { + 'light': ('#f6f7f9','#ffffff','#1f2328','#57606a','#eaeef2','#d0d7de','#0969da'), + 'dark': ('#010409','#0d1117','#e6edf3','#b1bac4','#21262d','#57606a','#79c0ff'), + 'sepia': ('#eee5d2','#faf4e6','#463b2d','#6b5943','#eae0cd','#b5a58b','#80532a'), + 'paper-moments': ('#f4ede0','#fffdf4','#514638','#79654f','#eee7d8','#b8a58f','#8c503b'), + 'midnight-purple': ('#100c18','#191322','#eee7f8','#c0accf','#30253f','#705a85','#d3a7ff'), +} + +def html_theme(theme_id, warnings): + if theme_id not in PALETTES: + warnings.append(f'HTML 不支持主题 {theme_id}，已使用 light 导出配色') + theme_id = 'light' + names = ('page','surface','text','muted','code','border','accent') + return theme_id, ':root{' + ';'.join(f'--{k}:{v}' for k,v in zip(names,PALETTES[theme_id])) + '}' + +def print_theme_warning(options, warnings, format_name): + if options.theme_id != 'light': + warnings.append(f'{format_name} 使用浅色打印样式，不支持主题 {options.theme_id}；需要主题配色请导出 HTML') + +# Semantic type, portable title symbol and contrasting print color. +CALLOUTS = { + 'note': ('i','#0969da'), 'abstract': ('=','#7041a0'), + 'info': ('i','#0969da'), 'todo': ('[ ]','#0969da'), + 'tip': ('+','#176f41'), 'success': ('+','#176f41'), + 'question': ('?','#805400'), 'warning': ('!','#805400'), + 'failure': ('x','#b42318'), 'danger': ('!','#b42318'), + 'bug': ('!','#b42318'), 'important': ('!','#7041a0'), 'example': ('*','#7041a0'), 'quote': ('>','#57606a'), +} +ALIASES = {'summary':'abstract','tldr':'abstract','hint':'tip', + 'check':'success','done':'success','help':'question','faq':'question', + 'caution':'warning','attention':'warning','fail':'failure','missing':'failure', + 'error':'danger','cite':'quote'} diff --git a/backend/tests/test_export.py b/backend/tests/test_export.py index cef356a..b5bdc09 100644 --- a/backend/tests/test_export.py +++ b/backend/tests/test_export.py @@ -791,3 +791,166 @@ def test_export_limits_concurrent_rendering(monkeypatch) -> None: finished = asyncio.run(_go()) assert all(j.status == ExportStatus.completed for j in finished) assert peak <= export_service.MAX_CONCURRENT_RENDERS + + +from app.export.themes import CALLOUTS, ALIASES, PALETTES + +@pytest.mark.parametrize("theme", list(PALETTES)) +def test_export_theme_palette(theme): + result = HtmlExporter().render(parse_document("`inline`"), ExportOptions(theme_id=theme)) + text = result.content.decode() + assert f"--surface:{PALETTES[theme][1]}" in text + assert f"--text:{PALETTES[theme][2]}" in text + assert 'pre.code-theme-github-light { background: #f6f8fa; color: #1f2328; }' in text + assert not result.warnings + + +def test_unknown_theme_is_not_injected(): + result = HtmlExporter().render(parse_document("body"), ExportOptions(theme_id="")) + assert result.warnings + assert '