Skip to content

[0629] 修复 coloneqq 相关的 mathtools 宏包依赖导出缺失问题 #3559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JackYansongLi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[0629] 修复 coloneqq 相关的 mathtools 宏包依赖导出缺失问题 #3559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed513d8
[0629] Doc: 编写 coloneqq 的 mathtools 依赖导出修复任务文档
JackYansongLi May 28, 2026
e3cff3c
[0629] 修复 coloneqq 相关的 mathtools 宏包依赖导出缺失问题并编写集成测试
JackYansongLi May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 122 additions & 101 deletions TeXmacs/plugins/latex/progs/convert/latex/latex-drd.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,41 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(texmacs-module (convert latex latex-drd)
(:use (convert latex latex-overload)))
(texmacs-module (convert latex latex-drd) (:use (convert latex latex-overload)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Order in which packages should be included
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(logic-table latex-package-priority%
("geometry" 10)
("amsmath" 20)
("amssymb" 30)
("graphicx" 40)
("wasysym" 50)
("stmaryrd" 60)
("textcomp" 60)
("enumerate" 70)
("epsfig" 80)
("mathrsfs" 90)
("bbm" 100)
("dsfont" 110)
("euscript" 120)
("multicol" 130)
("hyperref" 140)
("mathtools" 150)
("cleveref" 160))
("geometry" 10)
("amsmath" 20)
("amssymb" 30)
("graphicx" 40)
("wasysym" 50)
("stmaryrd" 60)
("textcomp" 60)
("enumerate" 70)
("epsfig" 80)
("mathrsfs" 90)
("bbm" 100)
("dsfont" 110)
("euscript" 120)
("multicol" 130)
("hyperref" 140)
("mathtools" 150)
("cleveref" 160)
) ;logic-table

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Dependencies between style files and packages
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(logic-table latex-depends%
("amsart" "amstex")
("amstex" "amsmath")
("amstex" "amsthm"))
("amsart" "amstex")
("amstex" "amsmath")
("amstex" "amsthm")
) ;logic-table

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Dependencies of commands on packages
Expand Down Expand Up @@ -76,6 +77,7 @@
(mathbb "amssymb")
(theorembodyfont "theorem")
(substack "mathtools")
(coloneqq "mathtools")

(begin-align "amsmath")
(begin-align* "amsmath")
Expand Down Expand Up @@ -111,12 +113,12 @@

(underaccent "accents")
(ring "accents")

(ifthenelse "ifthen")
(captionof "capt-of")
(widthof "calc")
(color "xcolor")

(color "xcolor")
(fcolorbox "xcolor")
(textcolor "xcolor")

Expand All @@ -138,7 +140,7 @@

(cref "cleveref")
(Cref "cleveref")

(citet "natbib")
(citep "natbib")
(citet* "natbib")
Expand All @@ -162,111 +164,127 @@
(ifthispageodd "scrextend")

(begin-linenumbers "lineno")
(resetlinenumber "lineno"))
(resetlinenumber "lineno")
) ;logic-table

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Page size settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(logic-table latex-paper-opts%
("page-top" "top")
("page-bot" "bottom")
("page-odd" "left")
("page-even" "left")
("page-right" "right")
("page-height" "paperheight")
("page-width" "paperwidth")
("page-type" "page-type")
("page-orientation" "page-orientation"))
("page-top" "top")
("page-bot" "bottom")
("page-odd" "left")
("page-even" "left")
("page-right" "right")
("page-height" "paperheight")
("page-width" "paperwidth")
("page-type" "page-type")
("page-orientation" "page-orientation")
) ;logic-table

(logic-table latex-paper-type%
("a0" "a0paper")
("a1" "a1paper")
("a2" "a2paper")
("a3" "a3paper")
("a4" "a4paper")
("a5" "a5paper")
("a6" "a6paper")
("a7" "papersize={74mm,105mm}")
("a8" "papersize={52mm,74mm")
("a9" "papersize={37mm,52mm}")
("b0" "b0paper")
("b1" "b1paper")
("b2" "b2paper")
("b3" "b3paper")
("b4" "b4paper")
("b5" "b5paper")
("b6" "b6paper")
("b7" "papersize={88mm,125mm}")
("b8" "papersize={62mm,88mm}")
("b9" "papersize={44mm,62mm}")
("legal" "legalpaper")
("letter" "letterpaper")
("executive" "executivepaper")
("archA" "papersize={9in,12in}")
("archB" "papersize={12in,18in}")
("archC" "papersize={18in,24in}")
("archD" "papersize={24in,36in}")
("archE" "papersize={36in,48in}")
("10x14" "papersize={10in,14in}")
("11x17" "papersize={11in,17in}")
("C5" "papersize={162mm,229mm}")
("Comm10" "papersize={297pt,684pt}")
("DL" "papersize={110mm,220mm}")
("halfletter" "papersize={140mm,216mm}")
("halfexecutive" "papersize={133mm,184mm}")
("ledger" "papersize={432mm,279mm}")
("Monarch" "papersize={98mm,190mm}")
("csheet" "papersize={432mm,559mm}")
("dsheet" "papersize={559mm,864mm}")
("esheet" "papersize={864mm,1118mm}")
("flsa" "papersize={216mm,330mm}")
("flse" "papersize={216mm,330mm}")
("folio" "papersize={216mm,330mm}")
("lecture note" "papersize={15.5cm,23.5cm}")
("note" "papersize={216mm,279mm}")
("quarto" "papersize={215mm,275mm}")
("statement" "papersize={140mm,216mm}")
("tabloid" "papersize={279mm,432mm}"))
("a0" "a0paper")
("a1" "a1paper")
("a2" "a2paper")
("a3" "a3paper")
("a4" "a4paper")
("a5" "a5paper")
("a6" "a6paper")
("a7" "papersize={74mm,105mm}")
("a8" "papersize={52mm,74mm")
("a9" "papersize={37mm,52mm}")
("b0" "b0paper")
("b1" "b1paper")
("b2" "b2paper")
("b3" "b3paper")
("b4" "b4paper")
("b5" "b5paper")
("b6" "b6paper")
("b7" "papersize={88mm,125mm}")
("b8" "papersize={62mm,88mm}")
("b9" "papersize={44mm,62mm}")
("legal" "legalpaper")
("letter" "letterpaper")
("executive" "executivepaper")
("archA" "papersize={9in,12in}")
("archB" "papersize={12in,18in}")
("archC" "papersize={18in,24in}")
("archD" "papersize={24in,36in}")
("archE" "papersize={36in,48in}")
("10x14" "papersize={10in,14in}")
("11x17" "papersize={11in,17in}")
("C5" "papersize={162mm,229mm}")
("Comm10" "papersize={297pt,684pt}")
("DL" "papersize={110mm,220mm}")
("halfletter" "papersize={140mm,216mm}")
("halfexecutive" "papersize={133mm,184mm}")
("ledger" "papersize={432mm,279mm}")
("Monarch" "papersize={98mm,190mm}")
("csheet" "papersize={432mm,559mm}")
("dsheet" "papersize={559mm,864mm}")
("esheet" "papersize={864mm,1118mm}")
("flsa" "papersize={216mm,330mm}")
("flse" "papersize={216mm,330mm}")
("folio" "papersize={216mm,330mm}")
("lecture note" "papersize={15.5cm,23.5cm}")
("note" "papersize={216mm,279mm}")
("quarto" "papersize={215mm,275mm}")
("statement" "papersize={140mm,216mm}")
("tabloid" "papersize={279mm,432mm}")
) ;logic-table

;; cpp interface with reversed access

(tm-define (latex-paper-opts s)
(with r (query `(latex-paper-opts% 'x ,s))
(if (nnull? r) (cdaar r) "undefined")))
(with r
(query `(latex-paper-opts% 'x ,s))
(if (nnull? r) (cdaar r) "undefined")
) ;with
) ;tm-define

(tm-define (latex-paper-type s)
(with r (query `(latex-paper-type% 'x ,s))
(if (nnull? r) (cdaar r) "undefined")))
(with r
(query `(latex-paper-type% 'x ,s))
(if (nnull? r) (cdaar r) "undefined")
) ;with
) ;tm-define

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Routines for consulting the database (might become deprecated)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(define (latex-resolve s)
(define (safe-string2symbol s)
(if (== s "") (string->symbol " ") (string->symbol s)))
(if (== s "") (string->symbol " ") (string->symbol s))
) ;define

(if (string-starts? s "\\")
(set! s (substring s 1 (string-length s))))
(if (string-starts? s "\\") (set! s (substring s 1 (string-length s))))

(with arity (logic-ref latex-arity% (safe-string2symbol s))
(with arity
(logic-ref latex-arity% (safe-string2symbol s))
(if (logic-in? (safe-string2symbol s) latex-optional-arg%)
(set! arity (- -1 arity)))
(set! arity (- -1 arity))
) ;if
(if (string-starts? s "end-")
(begin
(set! s (string-append "begin-" (substring s 4 (string-length s))))
(set! arity 0)))
(values (safe-string2symbol s) arity)))
(begin
(set! s (string-append "begin-" (substring s 4 (string-length s))))
(set! arity 0)
) ;begin
) ;if
(values (safe-string2symbol s) arity)
) ;with
) ;define

(tm-define (latex-arity tag)
"Get the arity of a LaTeX @tag"
(receive (s arity) (latex-resolve tag)
(or arity 0)))
(receive (s arity) (latex-resolve tag) (or arity 0))
) ;tm-define

(tm-define (latex-type tag)
"Get the type of a LaTeX @tag"
(receive (s arity) (latex-resolve tag)
(receive (s arity)
(latex-resolve tag)
(cond ((not arity) "undefined")
((logic-in? s latex-command%) "command")
((logic-in? s latex-length%) "length")
Expand All @@ -284,4 +302,7 @@
((logic-in? s latex-texmacs%) "texmacs")
((logic-in? s latex-symbol%) "symbol")
((logic-in? s latex-big-symbol%) "big-symbol")
(else "undefined"))))
(else "undefined")
) ;cond
) ;receive
) ;tm-define
Loading
Loading