hgg-latex 0.1.0.0 → 0.2.0.0
raw patch · 4 files changed
+282/−79 lines, 4 filesdep ~hgg-coredep ~hgg-framePVP ok
version bump matches the API change (PVP)
Dependency ranges changed: hgg-core, hgg-frame
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- hgg-latex.cabal +3/−3
- src/Graphics/Hgg/Backend/LaTeX.hs +245/−76
- test/Spec.hs +29/−0
CHANGELOG.md view
@@ -1,5 +1,10 @@ # Changelog for `hgg-latex` +## 0.2.0.0 — 2026-08-13++- Follows the hgg-core 0.2 coordinate generalization.+- Bilingual (English / Japanese) haddock.+ ## 0.1.0.0 — 2026-07-18 First public release on Hackage.
hgg-latex.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.0 name: hgg-latex-version: 0.1.0.0+version: 0.2.0.0 extra-doc-files: CHANGELOG.md synopsis: LaTeX (TikZ) backend for hgg description:@@ -31,8 +31,8 @@ hs-source-dirs: src build-depends: base >= 4.17 && < 5 , text >= 2.0 && < 2.2- , hgg-core ^>= 0.1- , hgg-frame ^>= 0.1+ , hgg-core ^>= 0.2+ , hgg-frame ^>= 0.2 default-language: Haskell2010 test-suite hgg-latex-tests
src/Graphics/Hgg/Backend/LaTeX.hs view
@@ -4,11 +4,18 @@ -- Copyright : (c) 2026 Aelysce Project (Toshiaki Honda) -- License : BSD-3-Clause ----- plot-core の '[Primitive]' を TikZ 命令の純テキストに解釈する+-- [日本語]: plot-core の '[Primitive]' を TikZ 命令の純テキストに解釈する -- (SVG/PDF backend と同じ Layer 1 構図)。 座標系は per-primitive で -- y 反転 (TikZ = 左下原点 y 上向き / Primitive = SVG 系 左上原点 y 下向き。 -- PDF backend と同方針 = global flip は text が鏡像になるため不可)。 --+-- [English]: Interprets plot-core's '[Primitive]' as plain TikZ instruction+-- text (the same Layer 1 structure as the SVG/PDF backends). The coordinate+-- system is y-flipped per primitive (TikZ has its origin at the bottom-left+-- with y pointing up, while Primitive uses the SVG convention — origin+-- top-left, y pointing down. The same policy as the PDF backend: a global+-- flip is not an option since it would mirror text).+-- -- emit 規約は A1 実測で確定 (design/phase54-latex/README.md): -- * 座標・寸法は明示 bp (= PostScript pt = core の pt。 TeX pt とは 0.37% 差) -- * 数値は固定小数 3 桁 (TikZ は指数表記の寸法を読めない)@@ -16,12 +23,26 @@ -- * text は node anchor (base west/base/base east) + rotate CCW 恒等 -- * 既定 preamble は DejaVuSans.sty (core の charWidthEm 較正元と同フォント、 -- A1 実測で見積り比 0.93-1.11 = SVG backend と同等誤差クラス)+--+-- [English]: The emit conventions were fixed through empirical measurement+-- (design/phase54-latex/README.md):+-- * coordinates and dimensions are always given in explicit bp (= PostScript+-- pt = core's pt; differs from TeX pt by 0.37%)+-- * numbers use a fixed 3-decimal format (TikZ cannot read exponential+-- notation for dimensions)+-- * colors are collected in the preamble via+-- \definecolor{pcRRGGBB}{HTML}{RRGGBB}+-- * text uses a node anchor (base west/base/base east) with rotate taken+-- as CCW identity+-- * the default preamble is DejaVuSans.sty (the same font that core's+-- charWidthEm calibration is based on; measurement gives an estimate+-- ratio of 0.93-1.11, the same error class as the SVG backend) {-# LANGUAGE OverloadedStrings #-} module Graphics.Hgg.Backend.LaTeX ( -- * 通常 (Resolver 不要 = inline 列のみの図) saveTeX , renderTeX- -- * Resolver 同伴 (= 'ColByName' を含む図)+ -- * Resolver 同伴 (= @ColByName@ を含む図) , saveTeXWith , renderTeXWith -- * 出力設定 (standalone / 素片 mode・preamble 差し替え・CJK family)@@ -48,7 +69,9 @@ Transform (..), renderToPrimitives) import Graphics.Hgg.Spec (Resolver, VisualSpec, emptyResolver) import Graphics.Hgg.Validate (Severity (..), diagnosticSeverity,- renderDiagnostic)+ renderDiagnostic,+ reportFacetInlineWarnings,+ reportTernaryMarkWarnings) import Data.Char (isHexDigit, toUpper) import Data.List (nub) import Data.Text (Text)@@ -61,21 +84,30 @@ -- 入口 (SVG backend の saveSVG / saveSVGWith / saveSVGBound と対称) -- =========================================================================== --- | LaTeX (standalone documentclass) ファイルに保存。 Resolver 不要--- (= inline 列のみの図、 = 通常)。 列名参照を含む図は 'saveTeXWith'、--- DataFrame は 'saveTeXBound' (@df |>> spec@)。+-- | [日本語]: LaTeX (standalone documentclass) ファイルに保存。 Resolver 不要+-- (= inline 列のみの図、 = 通常)。 列名参照を含む図は 'saveTeXWith'、+-- DataFrame は 'saveTeXBound' (@df |>> spec@)。+-- [English]: Saves to a LaTeX file (standalone documentclass). No+-- 'Resolver' needed (figures with inline columns only — the usual case).+-- For figures with column-name references use 'saveTeXWith'; for a+-- DataFrame use 'saveTeXBound' (@df |>> spec@). saveTeX :: FilePath -> VisualSpec -> IO () saveTeX path = saveTeXWith path emptyResolver --- | 'Resolver' を渡して LaTeX ファイルに保存。 'ColByName' を含む図用。+-- | [日本語]: 'Resolver' を渡して LaTeX ファイルに保存。 @ColByName@ を含む図用。+-- [English]: Saves to a LaTeX file given a 'Resolver'. For figures that+-- include @ColByName@. saveTeXWith :: FilePath -> Resolver -> VisualSpec -> IO () saveTeXWith = saveTeXConfigured defaultTeXConfig --- | 'VisualSpec' を LaTeX text に。 Resolver 不要版。+-- | [日本語]: 'VisualSpec' を LaTeX text に。 Resolver 不要版。+-- [English]: Renders a 'VisualSpec' to LaTeX text. The Resolver-free+-- variant. renderTeX :: VisualSpec -> Text renderTeX = renderTeXWith emptyResolver --- | 'Resolver' を渡して 'VisualSpec' を LaTeX text に。+-- | [日本語]: 'Resolver' を渡して 'VisualSpec' を LaTeX text に。+-- [English]: Renders a 'VisualSpec' to LaTeX text given a 'Resolver'. renderTeXWith :: Resolver -> VisualSpec -> Text renderTeXWith = renderTeXConfigured defaultTeXConfig @@ -83,37 +115,66 @@ -- 出力設定 (rasterific の PNGConfig / savePNGConfigured と対称) -- =========================================================================== --- | LaTeX 出力設定。 'defaultTeXConfig' から record update で部分指定する。+-- | [日本語]: LaTeX 出力設定。 'defaultTeXConfig' から record update で部分指定する。+-- [English]: LaTeX output settings. Specify individual fields via a+-- record update on 'defaultTeXConfig'. data TeXConfig = TeXConfig { texStandalone :: Bool- -- ^ True (既定) = standalone documentclass の単体コンパイル可能文書。+ -- ^ [日本語]: True (既定) = standalone documentclass の単体コンパイル可能文書。 -- False = @tikzpicture@ 環境の素片のみ (本文へ @\\input@ する用。 -- 親文書側に tikz / DejaVuSans / (日本語時) CJKutf8 の \\usepackage が必要)+ -- [English]: True (default) produces a self-contained,+ -- independently-compilable standalone-documentclass document. False+ -- emits only the @tikzpicture@ environment fragment (for+ -- @\\input@-ing into a parent document, which must itself+ -- \\usepackage tikz / DejaVuSans / (for Japanese) CJKutf8). , texExtraPreamble :: [Text]- -- ^ preamble 追加行 (font 差し替え等)。 standalone 時のみ有効+ -- ^ [日本語]: preamble 追加行 (font 差し替え等)。 standalone 時のみ有効+ -- [English]: Extra preamble lines (e.g. font substitution). Only+ -- takes effect in standalone mode. , texCJKMode :: CJKMode- -- ^ CJK ラベルの扱い (既定 'CJKWrap' = pdflatex 向け)+ -- ^ [日本語]: CJK ラベルの扱い (既定 'CJKWrap' = pdflatex 向け)+ -- [English]: How CJK labels are handled (default 'CJKWrap', for+ -- pdflatex). , texCJKFamily :: Text- -- ^ 'CJKWrap' 時の CJKutf8 font family (既定 "ipxg" = IPAexゴシック。+ -- ^ [日本語]: 'CJKWrap' 時の CJKutf8 font family (既定 "ipxg" = IPAexゴシック。 -- 明朝 = "ipxm")。 ラベルに CJK 文字がある時だけ CJK 環境と -- \\usepackage{CJKutf8} を出す+ -- [English]: The CJKutf8 font family used under 'CJKWrap' (default+ -- "ipxg" = IPAex Gothic; "ipxm" for Mincho). The CJK environment and+ -- \\usepackage{CJKutf8} are only emitted when a label contains CJK+ -- characters. } --- | CJK ラベルの出力方式。 生成 .tex を組版するエンジンに合わせて選ぶ。+-- | [日本語]: CJK ラベルの出力方式。 生成 .tex を組版するエンジンに合わせて選ぶ。+-- [English]: How CJK labels are emitted. Choose according to the engine+-- that will typeset the generated .tex. data CJKMode = CJKWrap- -- ^ CJK 文字を含むラベルを @\\begin{CJK}{UTF8}{family}@ で包み、- -- \\usepackage{CJKutf8} を自動付与 (**pdflatex 向け**、 動作実測済)+ -- ^ [日本語]: CJK 文字を含むラベルを @\\begin{CJK}{UTF8}{family}@ で包み、+ -- \\usepackage{CJKutf8} を自動付与 (__pdflatex 向け__、 動作実測済)+ -- [English]: Wraps labels containing CJK characters in+ -- @\\begin{CJK}{UTF8}{family}@ and automatically adds+ -- \\usepackage{CJKutf8} (__for pdflatex__, verified working). | CJKRaw- -- ^ 包まず生 UTF-8 のまま出す (**lualatex / xelatex 向け**。 CJK フォント+ -- ^ [日本語]: 包まず生 UTF-8 のまま出す (__lualatex / xelatex 向け__。 CJK フォント -- 解決は preamble 側 = luatexja / fontspec 等に委ねる。 lualatex + -- luatexja で組版実測済 = 'luaLaTeXConfig')。 -- ★逆組合せの footgun (2026-07-09 実測): 'CJKWrap' の .tex を lualatex- -- で組むと **エラーにならず CJK 文字だけ黙って脱落**する。 lualatex で+ -- で組むと __エラーにならず CJK 文字だけ黙って脱落__する。 lualatex で -- 組むなら必ず CJKRaw を使うこと+ -- [English]: Emits labels as raw UTF-8 without wrapping (__for lualatex / xelatex__.+ -- CJK font resolution is left to the preamble —+ -- luatexja, fontspec, etc. Verified working when typeset with+ -- lualatex + luatexja, via 'luaLaTeXConfig'). A footgun with the+ -- reverse combination (verified 2026-07-09): typesetting a 'CJKWrap'+ -- .tex with lualatex does not error — it __silently drops only the CJK characters__.+ -- Always use CJKRaw when typesetting with lualatex. deriving (Show, Eq) --- | 既定設定 (standalone + pdflatex 向け CJKWrap + IPAexゴシック)。+-- | [日本語]: 既定設定 (standalone + pdflatex 向け CJKWrap + IPAexゴシック)。+-- [English]: The default settings (standalone + pdflatex-oriented CJKWrap+-- + IPAex Gothic). defaultTeXConfig :: TeXConfig defaultTeXConfig = TeXConfig { texStandalone = True@@ -122,23 +183,34 @@ , texCJKFamily = "ipxg" } --- | lualatex 向け preset (組版実測済 2026-07-09): CJK は wrap せず生 UTF-8、--- 日本語フォントは luatexja (既定 = 原ノ味) に委ねる。--- @saveTeXConfigured luaLaTeXConfig path r spec@ → @lualatex path@。+-- | [日本語]: lualatex 向け preset (組版実測済 2026-07-09): CJK は wrap せず生 UTF-8、+-- 日本語フォントは luatexja (既定 = 原ノ味) に委ねる。+-- @saveTeXConfigured luaLaTeXConfig path r spec@ → @lualatex path@。+-- [English]: The lualatex preset (verified working 2026-07-09): CJK is+-- emitted as raw UTF-8 without wrapping, and the Japanese font is left to+-- luatexja (default: Haranoaji). @saveTeXConfigured luaLaTeXConfig path r+-- spec@, then @lualatex path@. luaLaTeXConfig :: TeXConfig luaLaTeXConfig = defaultTeXConfig { texCJKMode = CJKRaw , texExtraPreamble = ["\\usepackage{luatexja}"] } --- | 設定付き保存 ('savePNGConfigured' と対称)。+-- | [日本語]: 設定付き保存 (@savePNGConfigured@ と対称)。+-- [English]: Saves with a config (mirrors @savePNGConfigured@). saveTeXConfigured :: TeXConfig -> FilePath -> Resolver -> VisualSpec -> IO ()-saveTeXConfigured cfg path r spec =+saveTeXConfigured cfg path r spec = do+ reportFacetInlineWarnings r spec -- ★ Phase 62 A4 (§3): 描画は継続+ reportTernaryMarkWarnings r spec -- Phase 64 A13: coordTernary unsupported mark TIO.writeFile path (renderTeXConfigured cfg r spec) --- | 設定付き render。--- ★ PDF backend と同じく pt 直結 (k=1、 dpi 乗算なし)。 layout/prims の--- 純 pt を bp 単位でそのまま書く (Phase 33 B5 の唯一 dpi 適用点は raster 系のみ)。+-- | [日本語]: 設定付き render。+-- ★ PDF backend と同じく pt 直結 (k=1、 dpi 乗算なし)。 layout/prims の+-- 純 pt を bp 単位でそのまま書く (dpi 適用点は raster 系のみ)。+-- [English]: Renders with a config. Like the PDF backend, dimensions map+-- directly to pt (k=1, no dpi multiplication) — layout/prims' plain pt+-- values are written straight out in bp units (dpi is only applied for+-- the raster backends). renderTeXConfigured :: TeXConfig -> Resolver -> VisualSpec -> Text renderTeXConfigured cfg r spec = let layout = computeLayout r spec@@ -146,16 +218,21 @@ ViewportSize w h = lpViewport layout in renderPrimitivesTeXConfigured cfg w h prims --- | 'BoundPlot' (= @df |>> spec@ の結果) を LaTeX ファイルに保存。--- Error severity の検証診断は stderr に報告してから書き出す--- (saveSVGBound と同じ lenient 既定)。+-- | [日本語]: 'BoundPlot' (= @df |>> spec@ の結果) を LaTeX ファイルに保存。+-- Error severity の検証診断は stderr に報告してから書き出す+-- (saveSVGBound と同じ lenient 既定)。+-- [English]: Saves a 'BoundPlot' (the result of @df |>> spec@) to a LaTeX+-- file. Reports error-severity validation diagnostics to stderr before+-- writing the file (the same lenient default as saveSVGBound). saveTeXBound :: FilePath -> BoundPlot -> IO () saveTeXBound path (BoundPlot r spec diags) = do mapM_ (hPutStrLn stderr . T.unpack . renderDiagnostic) (filter ((== SevError) . diagnosticSeverity) diags) saveTeXWith path r spec --- | [Primitive] 列を所与のキャンバスサイズで LaTeX に直接書く低レベル経路。+-- | [日本語]: [Primitive] 列を所与のキャンバスサイズで LaTeX に直接書く低レベル経路。+-- [English]: A low-level path that writes a list of Primitives directly to+-- LaTeX at a given canvas size. savePrimitivesTeX :: FilePath -> Int -> Int -> [Primitive] -> IO () savePrimitivesTeX path w h prims = TIO.writeFile path (renderPrimitivesTeX w h prims)@@ -164,11 +241,16 @@ -- 文書骨格 -- =========================================================================== --- | [Primitive] → standalone LaTeX 文書 (純関数、 golden test 可)。 既定設定。+-- | [日本語]: [Primitive] → standalone LaTeX 文書 (純関数、 golden test 可)。 既定設定。+-- [English]: Converts a list of Primitives to a standalone LaTeX document+-- (a pure function, testable against golden output). Uses the default+-- settings. renderPrimitivesTeX :: Int -> Int -> [Primitive] -> Text renderPrimitivesTeX = renderPrimitivesTeXConfigured defaultTeXConfig --- | [Primitive] → LaTeX text (設定付き・純関数)。+-- | [日本語]: [Primitive] → LaTeX text (設定付き・純関数)。+-- [English]: Converts a list of Primitives to LaTeX text (a pure+-- function, taking a config). renderPrimitivesTeXConfigured :: TeXConfig -> Int -> Int -> [Primitive] -> Text renderPrimitivesTeXConfigured cfg w h prims = T.unlines $ docHead ++ body ++ docFoot@@ -212,7 +294,9 @@ -- 色 (theme 色は全て "#rrggbb" hex。 preamble に \definecolor で集約) -- =========================================================================== --- | primitive 列が使う色を重複排除して \definecolor 行に。+-- | [日本語]: primitive 列が使う色を重複排除して \definecolor 行に。+-- [English]: Deduplicates the colors used by the list of primitives into+-- \definecolor lines. colorDefs :: [Primitive] -> [Text] colorDefs prims = [ "\\definecolor{pc" <> hx <> "}{HTML}{" <> hx <> "}"@@ -229,12 +313,16 @@ strokeC Nothing = [] strokeC (Just (StrokeStyle c _)) = [hex6 c] --- | TikZ 色名 (pcRRGGBB) 参照。+-- | [日本語]: TikZ 色名 (pcRRGGBB) 参照。+-- [English]: A reference to the TikZ color name (pcRRGGBB). colorRef :: Text -> Text colorRef c = "pc" <> hex6 c --- | 色文字列 → 6 桁大文字 hex。 "#rgb" は倍長化、 named / 不正は--- PDF backend の colorOf と同じ fallback (white 以外は黒)。+-- | [日本語]: 色文字列 → 6 桁大文字 hex。 "#rgb" は倍長化、 named / 不正は+-- PDF backend の colorOf と同じ fallback (white 以外は黒)。+-- [English]: Converts a color string to 6-digit uppercase hex. "#rgb" is+-- doubled; named colors / invalid input fall back the same way as the PDF+-- backend's colorOf (black, except for white). hex6 :: Text -> Text hex6 t = case T.unpack t of ['#', r1, r2, g1, g2, b1, b2]@@ -249,11 +337,19 @@ -- Primitive 解釈器 -- =========================================================================== --- | Primitive 列を順に TikZ 行へ。 第 1 引数 = viewport 高さ (y 反転用)。+-- | [日本語]: Primitive 列を順に TikZ 行へ。 第 1 引数 = viewport 高さ (y 反転用)。 ----- PClipPush/PTransformPush は対応する Pop までを**再帰グルーピング**して--- @\\begin{scope}@ に入れる (PDF backend の 'breakMatch' と同型。 TikZ の--- clip / cm も scope 終端でしか戻せない)。 対応の取れない Pop は黙って無視。+-- PClipPush/PTransformPush は対応する Pop までを__再帰グルーピング__して+-- @\\begin{scope}@ に入れる (PDF backend の 'breakMatch' と同型。 TikZ の+-- clip / cm も scope 終端でしか戻せない)。 対応の取れない Pop は黙って無視。+--+-- [English]: Converts the list of Primitives to TikZ lines, in order. The+-- first argument is the viewport height (used for the y flip).+--+-- PClipPush/PTransformPush __recursively groups__ everything up to the+-- matching Pop and wraps it in @\\begin{scope}@ (the same shape as the PDF+-- backend's 'breakMatch' — TikZ's clip / cm can likewise only be undone+-- at the end of a scope). An unmatched Pop is silently ignored. drawPrims :: TeXConfig -> Double -> [Primitive] -> [Text] drawPrims cfg h = go where@@ -262,6 +358,12 @@ let (inner, after) = breakMatch isClipPush isClipPop rest in ("\\begin{scope}" : clipRectOf h rect : go inner) ++ ("\\end{scope}" : go after)+ -- Phase 64 §2: 多角形 clip。 3 点未満は \clip を出さず scope だけ開く (素通し)。+ go (PClipPath pts : rest) =+ let (inner, after) = breakMatch isClipPush isClipPop rest+ clipLine = [clipPolyOf h pts | length pts >= 3]+ in (("\\begin{scope}" : clipLine) ++ go inner)+ ++ ("\\end{scope}" : go after) go (PTransformPush tr : rest) = let (inner, after) = breakMatch isTrPush isTrPop rest in ("\\begin{scope}[cm={" <> cmOf h tr <> "}]" : go inner)@@ -270,13 +372,18 @@ go (PTransformPop : rest) = go rest go (p : rest) = drawOne cfg h p ++ go rest - isClipPush p = case p of { PClipPush _ -> True; _ -> False }+ -- clip push は矩形版 / 多角形版の 2 種。 入れ子の数え上げでは同じ「push」 扱い。+ isClipPush p = case p of { PClipPush _ -> True; PClipPath _ -> True; _ -> False } isClipPop p = case p of { PClipPop -> True; _ -> False } isTrPush p = case p of { PTransformPush _ -> True; _ -> False } isTrPop p = case p of { PTransformPop -> True; _ -> False } --- | 同種 push の入れ子を数えながら、 対応する pop までの内側と残りに割る--- (PDF backend の breakMatch と同一。 対応 pop 無し = 末尾まで scope)。+-- | [日本語]: 同種 push の入れ子を数えながら、 対応する pop までの内側と残りに割る+-- (PDF backend の breakMatch と同一。 対応 pop 無し = 末尾まで scope)。+-- [English]: Counts nested pushes of the same kind and splits the list+-- into the inner part (up to the matching pop) and the rest (identical to+-- the PDF backend's breakMatch. With no matching pop, the scope extends+-- to the end). breakMatch :: (Primitive -> Bool) -> (Primitive -> Bool) -> [Primitive] -> ([Primitive], [Primitive]) breakMatch isPush isPop = walk (0 :: Int)@@ -289,23 +396,43 @@ (inner, after) = walk n' rest in (p : inner, after) --- | 矩形 clip ('Rect' は左上基準 → y 反転して両角)。+-- | [日本語]: 矩形 clip ('Rect' は左上基準 → y 反転して両角)。+-- [English]: Rectangular clip ('Rect' is anchored at the top-left, so+-- both corners are y-flipped). clipRectOf :: Double -> Rect -> Text clipRectOf h (Rect x y w rh) = "\\clip " <> xy x (h - y - rh) <> " rectangle " <> xy (x + w) (h - y) <> ";" --- | SVG 系 Transform → TikZ cm= 明示行列 (a,b,c,d,(tx,ty))。 y 反転 F が--- per-primitive に掛かるため **F∘M∘F (共役)** で写す — PDF backend の--- 'matrixOf' と同一式: translate (dx,dy) → (dx,−dy) / scale (sx,sy) →--- 平行移動 (0, h(1−sy)) 付き scale。 ※現状 core は PTransformPush を発行しない--- (SVG backend も未対応) — 将来の発行に備えた整合実装。+-- | [日本語]: 多角形 clip ('PClipPath')。 頂点を @--@ で繋ぎ @-- cycle@ で閉じる。+-- y は viewport 高さで反転 ('clipRectOf' と同じ)。+-- [English]: Polygon clip (for 'PClipPath'). Joins vertices with @--@ and+-- closes with @-- cycle@. y is flipped by the viewport height (as in+-- 'clipRectOf').+clipPolyOf :: Double -> [Point] -> Text+clipPolyOf h pts =+ "\\clip " <> T.intercalate " -- " [xy x (h - y) | Point x y <- pts] <> " -- cycle;"++-- | [日本語]: SVG 系 Transform → TikZ cm= 明示行列 (a,b,c,d,(tx,ty))。 y 反転 F が+-- per-primitive に掛かるため __F∘M∘F (共役)__ で写す — PDF backend の+-- @matrixOf@ と同一式: translate (dx,dy) → (dx,−dy) / scale (sx,sy) →+-- 平行移動 (0, h(1−sy)) 付き scale。 ※現状 core は PTransformPush を発行しない+-- (SVG backend も未対応) — 将来の発行に備えた整合実装。+-- [English]: Converts an SVG-style Transform to a TikZ cm= explicit matrix+-- (a,b,c,d,(tx,ty)). Since the y flip F is applied per primitive, it is+-- mapped using __F∘M∘F (conjugation)__ — the same formula as the PDF+-- backend's @matrixOf@: translate (dx,dy) → (dx,−dy); scale (sx,sy) → a+-- scale with a translation of (0, h(1−sy)). Note: core currently never+-- emits PTransformPush (nor does the SVG backend support it) — this is a+-- consistent implementation kept ready for when it eventually does. cmOf :: Double -> Transform -> Text cmOf _ (TranslateT dx dy) = "1,0,0,1,(" <> bp dx <> "," <> bp (negate dy) <> ")" cmOf h (ScaleT sx sy) = num sx <> ",0,0," <> num sy <> ",(0bp," <> bp (h * (1 - sy)) <> ")" --- | 単独 primitive → TikZ 行 (0 行 = skip)。 push/pop は 'drawPrims' が先に消費。+-- | [日本語]: 単独 primitive → TikZ 行 (0 行 = skip)。 push/pop は 'drawPrims' が先に消費。+-- [English]: Converts a single primitive to TikZ lines (zero lines means+-- skip). push/pop are consumed beforehand by 'drawPrims'. drawOne :: TeXConfig -> Double -> Primitive -> [Text] drawOne _ h (PLine a b ls) = [drawLine h a b ls] drawOne _ h (PRect rect fs ms) = drawRect h rect fs ms@@ -314,8 +441,11 @@ drawOne cfg h (PText p s ts) = [drawText cfg h p s ts] drawOne _ _ _ = [] --- | パス: MoveTo/LineTo/CurveTo/ClosePath を TikZ path 式に写す。--- 途中の MoveTo は subpath 切替 (座標の並置 = TikZ の move-to)。+-- | [日本語]: パス: MoveTo/LineTo/CurveTo/ClosePath を TikZ path 式に写す。+-- 途中の MoveTo は subpath 切替 (座標の並置 = TikZ の move-to)。+-- [English]: Path: maps MoveTo/LineTo/CurveTo/ClosePath to a TikZ path+-- expression. A MoveTo partway through switches subpaths (juxtaposed+-- coordinates form TikZ's move-to). drawPath :: Double -> [PathSegment] -> FillStyle -> Maybe StrokeStyle -> [Text] drawPath _ [] _ _ = [] drawPath h segs fs ms =@@ -330,15 +460,20 @@ <> " .. " <> pt h p seg ClosePath = " -- cycle" --- | 線分: \draw[line width, color, dash pattern]。+-- | [日本語]: 線分: \draw[line width, color, dash pattern]。+-- [English]: Line segment: \draw[line width, color, dash pattern]. drawLine :: Double -> Point -> Point -> LineStyle -> Text drawLine h a b (LineStyle col w dash) = T.concat [ "\\draw[", T.intercalate ", " ([ "line width=" <> bp w, "color=" <> colorRef col ] ++ dashOpt dash) , "] ", pt h a, " -- ", pt h b, ";" ] --- | LineStyle の dash 配列 (pt) → TikZ dash pattern。 空 = 実線 (option 無し)。--- 奇数長は SVG stroke-dasharray と同じく 2 周期に複製して on/off 対にする。+-- | [日本語]: LineStyle の dash 配列 (pt) → TikZ dash pattern。 空 = 実線 (option 無し)。+-- 奇数長は SVG stroke-dasharray と同じく 2 周期に複製して on/off 対にする。+-- [English]: Converts LineStyle's dash array (pt) to a TikZ dash pattern.+-- An empty array means a solid line (no option emitted). An odd-length+-- array is duplicated to two periods, matching SVG's stroke-dasharray, to+-- form on/off pairs. dashOpt :: [Double] -> [Text] dashOpt [] = [] dashOpt ds =@@ -347,7 +482,9 @@ onOff _ = [] in [ "dash pattern=" <> T.unwords (onOff ds') ] --- | 矩形: \path[fill/draw] (x0,y0) rectangle (x1,y1)。 'Rect' は左上基準。+-- | [日本語]: 矩形: \path[fill/draw] (x0,y0) rectangle (x1,y1)。 'Rect' は左上基準。+-- [English]: Rectangle: \path[fill/draw] (x0,y0) rectangle (x1,y1).+-- 'Rect' is anchored at the top-left. drawRect :: Double -> Rect -> FillStyle -> Maybe StrokeStyle -> [Text] drawRect h (Rect x y w rh) fs ms = case fillDrawOpts fs ms of@@ -356,7 +493,9 @@ [ "\\path[", T.intercalate ", " os, "] " , xy x (h - y - rh), " rectangle ", xy (x + w) (h - y), ";" ] ] --- | 円: \path[fill/draw] circle。 hover label は LaTeX では捨てる (PDF と同じ)。+-- | [日本語]: 円: \path[fill/draw] circle。 hover label は LaTeX では捨てる (PDF と同じ)。+-- [English]: Circle: \path[fill/draw] circle. The hover label is dropped+-- in LaTeX output (as with PDF). drawCircle :: Double -> Point -> Double -> FillStyle -> Maybe StrokeStyle -> [Text] drawCircle h (Point cx cy) rad fs ms =@@ -366,7 +505,9 @@ [ "\\path[", T.intercalate ", " os, "] " , xy cx (h - cy), " circle [radius=", bp rad, "];" ] ] --- | fill (色 + opacity) / draw (色 + 線幅) の option 列。 両方無しは [] = skip。+-- | [日本語]: fill (色 + opacity) / draw (色 + 線幅) の option 列。 両方無しは [] = skip。+-- [English]: The option list for fill (color + opacity) / draw (color ++-- line width). An empty list means both are absent — skip. fillDrawOpts :: FillStyle -> Maybe StrokeStyle -> [Text] fillDrawOpts (FillStyle fc opa) ms = (if fc == "none" then []@@ -377,15 +518,29 @@ Just (StrokeStyle sc sw) -> [ "draw=" <> colorRef sc, "line width=" <> bp sw ] --- | PText: TikZ node。 anchor = base west/base/base east (SVG の--- text-anchor start/middle/end + alphabetic baseline に対応、 A1 probe 検証済)。--- tsRotate は core canonical CCW = TikZ CCW で恒等。 font は \sffamily--- (DejaVuSans.sty が sans を DejaVu 化) + \fontsize{bp}{1.2bp}。+-- | [日本語]: PText: TikZ node。 anchor = base west/base/base east (SVG の+-- text-anchor start/middle/end + alphabetic baseline に対応、 probe 検証済)。+-- tsRotate は core canonical CCW = TikZ CCW で恒等。 font は \sffamily+-- (DejaVuSans.sty が sans を DejaVu 化) + \fontsize{bp}{1.2bp}。 ----- ラベルの解釈 (A4):--- * 全体が @$...$@ の文字列 = **数式 passthrough** (escape せず生で出す。--- LaTeX backend の固有価値。 ★他 backend では $ 込みで文字列描画される)--- * CJK 文字を含む = 'texCJKFamily' の CJK 環境で包む (pdflatex + CJKutf8)+-- ラベルの解釈:+-- * 全体が @$...$@ の文字列 = __数式 passthrough__ (escape せず生で出す。+-- LaTeX backend の固有価値。 ★他 backend では $ 込みで文字列描画される)+-- * CJK 文字を含む = 'texCJKFamily' の CJK 環境で包む (pdflatex + CJKutf8)+--+-- [English]: PText: a TikZ node. The anchor is base west/base/base east+-- (corresponding to SVG's text-anchor start/middle/end plus alphabetic+-- baseline, verified by probe). tsRotate is passed through unchanged+-- since core's canonical CCW matches TikZ's CCW. The font uses \sffamily+-- (DejaVuSans.sty maps sans to DejaVu) + \fontsize{bp}{1.2bp}.+--+-- How labels are interpreted:+-- * a string entirely wrapped in @$...$@ is treated as __math passthrough__+-- (emitted raw, without escaping — a distinctive+-- feature of the LaTeX backend. other backends draw the $ characters+-- literally as part of the string)+-- * a string containing CJK characters is wrapped in the CJK+-- environment for 'texCJKFamily' (pdflatex + CJKutf8) drawText :: TeXConfig -> Double -> Point -> Text -> TextStyle -> Text drawText cfg h (Point x y) txt ts = T.concat [ "\\node[", T.intercalate ", " opts, "] at ", xy x (h - y)@@ -420,8 +575,11 @@ -- 書式 helper -- =========================================================================== --- | 全体が @$...$@ で包まれた数式ラベルか (passthrough 判定)。--- 内部に追加の $ を含む場合 (= "$a$ and $b$" のような混在) は数式扱いしない。+-- | [日本語]: 全体が @$...$@ で包まれた数式ラベルか (passthrough 判定)。+-- 内部に追加の $ を含む場合 (= "$a$ and $b$" のような混在) は数式扱いしない。+-- [English]: Checks whether a label is entirely wrapped in @$...$@ (the+-- passthrough test). If it contains additional $ characters inside (a mix+-- such as "$a$ and $b$"), it is not treated as math. isMathLabel :: Text -> Bool isMathLabel t = T.length t > 2@@ -429,7 +587,9 @@ && "$" `T.isSuffixOf` t && not ("$" `T.isInfixOf` T.drop 1 (T.dropEnd 1 t)) --- | LaTeX 特殊文字の escape (text mode)。 数式 passthrough は 'isMathLabel'。+-- | [日本語]: LaTeX 特殊文字の escape (text mode)。 数式 passthrough は 'isMathLabel'。+-- [English]: Escapes LaTeX special characters (text mode). Math+-- passthrough is handled by 'isMathLabel'. escapeTeX :: Text -> Text escapeTeX = T.concatMap esc where@@ -445,19 +605,28 @@ esc '^' = "\\textasciicircum{}" esc c = T.singleton c --- | 座標 (x, y は既に TikZ 系 = y 反転済で渡る)。+-- | [日本語]: 座標 (x, y は既に TikZ 系 = y 反転済で渡る)。+-- [English]: A coordinate (x, y are already in TikZ space — the y flip+-- has been applied by the caller). xy :: Double -> Double -> Text xy x y = "(" <> bp x <> "," <> bp y <> ")" --- | SVG 系座標 → TikZ 座標 (y 反転して括弧書き)。+-- | [日本語]: SVG 系座標 → TikZ 座標 (y 反転して括弧書き)。+-- [English]: Converts an SVG-style coordinate to a TikZ coordinate+-- (y-flipped and parenthesized). pt :: Double -> Point -> Text pt h (Point x y) = xy x (h - y) --- | 寸法 (bp 単位明示)。 固定小数 3 桁 = TikZ が読めない指数表記を回避しつつ--- 0.001bp (≈ 0.35µm) 精度で決定論的。+-- | [日本語]: 寸法 (bp 単位明示)。 固定小数 3 桁 = TikZ が読めない指数表記を回避しつつ+-- 0.001bp (≈ 0.35µm) 精度で決定論的。+-- [English]: A dimension (explicit bp unit). The fixed 3-decimal format+-- avoids the exponential notation that TikZ cannot read, while staying+-- deterministic at 0.001bp (≈ 0.35µm) precision. bp :: Double -> Text bp v = num v <> "bp" --- | 無次元数 (opacity / rotate)。 固定小数 3 桁。+-- | [日本語]: 無次元数 (opacity / rotate)。 固定小数 3 桁。+-- [English]: A dimensionless number (opacity / rotate). Fixed 3-decimal+-- format. num :: Double -> Text num v = T.pack (showFFloat (Just 3) v "")
test/Spec.hs view
@@ -105,6 +105,35 @@ T.count "\\begin{scope}" tex `shouldBe` 2 T.count "\\end{scope}" tex `shouldBe` 2 + -- Phase 64 A7: 多角形 clip。 y は viewport 高さ (100) で反転する。+ it "PClipPath → \\clip の多角形 (-- で繋ぎ -- cycle で閉じる)" $ do+ let prims = [ PClipPath [Point 50 10, Point 90 90, Point 10 90]+ , PLine (Point 0 0) (Point 9 9) (LineStyle "#000000" 1 [])+ , PClipPop ]+ tex = renderPrimitivesTeX 100 100 prims+ tex `shouldSatisfy` has+ "\\clip (50.000bp,90.000bp) -- (90.000bp,10.000bp) -- (10.000bp,10.000bp) -- cycle;"+ T.count "\\begin{scope}" tex `shouldBe` 1+ T.count "\\end{scope}" tex `shouldBe` 1++ it "PClipPath が 3 点未満なら \\clip を出さない (素通し) が scope は対応する" $ do+ let prims = [ PClipPath [Point 50 10, Point 90 90]+ , PLine (Point 0 0) (Point 9 9) (LineStyle "#000000" 1 [])+ , PClipPop ]+ tex = renderPrimitivesTeX 100 100 prims+ tex `shouldSatisfy` (not . has "\\clip")+ T.count "\\begin{scope}" tex `shouldBe` 1+ T.count "\\end{scope}" tex `shouldBe` 1++ it "PClipPath と PClipPush の入れ子も scope が対応する" $ do+ let prims = [ PClipPath [Point 50 10, Point 90 90, Point 10 90]+ , PClipPush (Rect 0 0 50 50)+ , PLine (Point 0 0) (Point 9 9) (LineStyle "#000000" 1 [])+ , PClipPop, PClipPop ]+ tex = renderPrimitivesTeX 100 100 prims+ T.count "\\begin{scope}" tex `shouldBe` 2+ T.count "\\end{scope}" tex `shouldBe` 2+ it "PTransformPush → cm= 共役行列 (PDF backend の matrixOf と同式)" $ do let prims = [ PTransformPush (TranslateT 5 7) , PLine (Point 0 0) (Point 1 1) (LineStyle "#000000" 1 [])