From 229e6eb8edb304a8b0e8dec70eaf8a6e9f990020 Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 1 Dec 2023 18:20:24 +0100 Subject: [PATCH] nixos-render-docs: don't drop code languages anymore this was needed because the nixos/nixpkgs manuals, for some reason, *did* drop the languages. we no longer have to render exactly as the docbook toolchain did, so we can finally fix this bug. --- .../tools/nix/nixos-render-docs/src/nixos_render_docs/html.py | 4 ++-- .../nix/nixos-render-docs/src/nixos_render_docs/options.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py index ffe64cde4d34..c6d8d317f6bf 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py @@ -97,8 +97,8 @@ class HTMLRenderer(Renderer): def strong_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "" def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: - # TODO use token.info. docbook doesn't so we can't yet. - return f'
\n{escape(token.content)}
' + info = f" {escape(token.info, True)}" if token.info != "" else "" + return f'
\n{escape(token.content)}
' def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: return '
' def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py index d0229e074c54..c5fa9acb9afc 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -496,8 +496,8 @@ class OptionsHTMLRenderer(OptionDocsRestrictions, HTMLRenderer): token.meta['compact'] = False return super().bullet_list_open(token, tokens, i) def fence(self, token: Token, tokens: Sequence[Token], i: int) -> str: - # TODO use token.info. docbook doesn't so we can't yet. - return f'
{html.escape(token.content)}
' + info = f" {html.escape(token.info, True)}" if token.info != "" else "" + return f'
{html.escape(token.content)}
' class HTMLConverter(BaseConverter[OptionsHTMLRenderer]): __option_block_separator__ = ""