Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion TeXmacs/fonts/enc/cmr.enc
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,25 @@
"up-i" "up-j" "up-k" "up-l" "up-m" "up-n" "up-o" "up-p"
"up-q" "up-r" "up-s" "up-t" "up-u" "up-v" "up-w" "up-x"
"up-y" "up-z"
65 "mathA" "mathB" "mathC"
68 "mathD" "mathE" "mathF" "mathG"
72 "mathH" "mathI" "mathJ" "mathK" "mathL" "mathM" "mathN"
79 "mathO" "mathP" "mathQ" "mathR" "mathS"
84 "mathT" "mathU" "mathV" "mathW" "mathX" "mathY" "mathZ"
67 "mathcatalan"
68 "mathD"
91 "large-[-0" "" "large-]-0"
94 "hat"
94 "wide-hat"
94 "wide-hat-0"
97 "matha"
98 "mathb" "mathc"
100 "mathd" "mathe"
102 "mathf" "mathg" "mathh"
105 "mathi"
106 "mathj" "mathk" "mathl" "mathm" "mathn"
111 "matho" "mathp" "mathq" "mathr" "maths"
116 "matht" "mathu" "mathv" "mathw" "mathx"
121 "mathy" "mathz"
126 "tilde"
126 "wide-tilde"
126 "wide-tilde-0"
Expand Down
50 changes: 49 additions & 1 deletion TeXmacs/langs/encoding/symbol-unicode-oneway.scm
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,59 @@
;; Admit variants <mathD*>, <mathd*>, etc.

("<mathcatalan>" "#43") ; Catalan constant

("<mathA>" "#41") ; for standard A
("<mathB>" "#42") ; for standard B
("<mathC>" "#43") ; for standard C
("<mathD>" "#44") ; Derivation operator
("<mathE>" "#45") ; for standard E
("<mathF>" "#46") ; for standard F
("<mathG>" "#47") ; for standard G
("<mathH>" "#48") ; for standard H
("<mathI>" "#49") ; for standard I
("<mathJ>" "#4A") ; for standard J
("<mathK>" "#4B") ; for standard K
("<mathL>" "#4C") ; for standard L
("<mathM>" "#4D") ; for standard M
("<mathN>" "#4E") ; for standard N
("<mathO>" "#4F") ; for standard O
("<mathP>" "#50") ; for standard P
("<mathQ>" "#51") ; for standard Q
("<mathR>" "#52") ; for standard R
("<mathS>" "#53") ; for standard S
("<mathT>" "#54") ; for standard T
("<mathU>" "#55") ; for standard U
("<mathV>" "#56") ; for standard V
("<mathW>" "#57") ; for standard W
("<mathX>" "#58") ; for standard X
("<mathY>" "#59") ; for standard Y
("<mathZ>" "#5A") ; for standard Z
("<matha>" "#61") ; for standard a
("<mathb>" "#62") ; for standard b
("<mathc>" "#63") ; for standard c
("<mathd>" "#64") ; differential (for d x inside integrals)
("<mathe>" "#65") ; exp(1)
("<mathf>" "#66") ; for standard f
("<mathg>" "#67") ; for standard g
("<mathh>" "#68") ; for standard h
("<mathi>" "#69") ; imaginary unit
("<mathj>" "#6A") ; variant of imaginary unit
("<mathk>" "#6B") ; for standard k
("<mathl>" "#6C") ; for standard l
("<mathm>" "#6D") ; for standard m
("<mathn>" "#6E") ; for standard n
("<matho>" "#6F") ; for standard o
("<mathp>" "#70") ; for standard p
("<mathq>" "#71") ; for standard q
("<mathr>" "#72") ; for standard r
("<maths>" "#73") ; for standard s
("<matht>" "#74") ; for standard t
("<mathu>" "#75") ; for standard u
("<mathv>" "#76") ; for standard v
("<mathw>" "#77") ; for standard w
("<mathx>" "#78") ; for standard x
("<mathy>" "#79") ; for standard y
("<mathz>" "#7A") ; for standard z
("<mathGamma>" "#0393") ; Gamma function
("<mathLaplace>" "#0394") ; Laplace operator
("<mathpi>" "#03C0") ; pi constant
Expand Down Expand Up @@ -112,7 +160,7 @@

;; These symbols should only be used internally by TeXmacs in the
;; LEFT, RIGHT, MID and BIG primitive. If they are explicitly
;; present, they are exported as a regular-sized character.
;; present, they are exported as a regular-sized character.

("<lvert>" "|")
("<rvert>" "|")
Expand Down
51 changes: 50 additions & 1 deletion TeXmacs/plugins/latex/progs/convert/latex/latex-define.scm
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,63 @@

;; extra literal symbols
(mathcatalan "\\mathrm{C}")
(mathA "\\mathrm{A}")
(mathB "\\mathrm{B}")
(mathC "\\mathrm{C}")
(mathD "\\mathrm{D}")
(mathE "\\mathrm{E}")
(mathF "\\mathrm{F}")
(mathG "\\mathrm{G}")
(mathH "\\mathrm{H}")
(mathI "\\mathrm{I}")
(mathJ "\\mathrm{J}")
(mathK "\\mathrm{K}")
(mathL "\\mathrm{L}")
(mathM "\\mathrm{M}")
(mathN "\\mathrm{N}")
(mathO "\\mathrm{O}")
(mathP "\\mathrm{P}")
(mathQ "\\mathrm{Q}")
(mathR "\\mathrm{R}")
(mathS "\\mathrm{S}")
(mathT "\\mathrm{T}")
(mathU "\\mathrm{U}")
(mathV "\\mathrm{V}")
(mathW "\\mathrm{W}")
(mathX "\\mathrm{X}")
(mathY "\\mathrm{Y}")
(mathZ "\\mathrm{Z}")
(matha "\\mathrm{a}")
(mathb "\\mathrm{b}")
(mathc "\\mathrm{c}")
(mathd "\\mathrm{d}")
(mathD "\\mathrm{D}")
(mathe "\\mathrm{e}")
(mathf "\\mathrm{f}")
(mathg "\\mathrm{g}")
(mathh "\\mathrm{h}")
(mathi "\\mathrm{i}")
(mathj "\\mathrm{j}")
(mathk "\\mathrm{k}")
(mathl "\\mathrm{l}")
(mathm "\\mathrm{m}")
(mathn "\\mathrm{n}")
(matho "\\mathrm{o}")
(mathp "\\mathrm{p}")
(mathq "\\mathrm{q}")
(mathr "\\mathrm{r}")
(maths "\\mathrm{s}")
(matht "\\mathrm{t}")
(mathu "\\mathrm{u}")
(mathv "\\mathrm{v}")
(mathw "\\mathrm{w}")
(mathx "\\mathrm{x}")
(mathy "\\mathrm{y}")
(mathz "\\mathrm{z}")
(matheuler "\\gamma")
(mathGamma "\\Gamma")
(mathlambda "\\lambda")
(mathLaplace "\\Delta")
(mathi "\\mathrm{i}")
(mathpi "\\pi")
(Alpha "\\mathrm{A}")
(Beta "\\mathrm{B}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@
divides ndivides asterisk dottimes precdot

;; extra literal symbols
mathcatalan mathd mathD mathe matheuler
mathGamma mathlambda mathLaplace mathi mathpi
mathcatalan mathA mathB mathC mathD mathE mathF mathG mathH mathI
mathJ mathK mathL mathM mathN mathO mathP mathQ mathR mathS mathT
mathU mathV mathW mathX mathY mathZ matha mathb mathc mathd mathD
mathe mathf mathg mathh mathi mathj mathk mathl mathm mathn matho
mathp mathq mathr maths matht mathu mathv mathw mathx mathy mathz
matheuler mathGamma mathlambda mathLaplace mathpi
Alpha Beta Epsilon Eta Iota Kappa Mu Nu Omicron Chi Rho Tau Zeta

;; negations
Expand Down
51 changes: 50 additions & 1 deletion TeXmacs/progs/convert/latex/latex-define.scm
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,63 @@

;; extra literal symbols
(mathcatalan "\\mathrm{C}")
(mathA "\\mathrm{A}")
(mathB "\\mathrm{B}")
(mathC "\\mathrm{C}")
(mathD "\\mathrm{D}")
(mathE "\\mathrm{E}")
(mathF "\\mathrm{F}")
(mathG "\\mathrm{G}")
(mathH "\\mathrm{H}")
(mathI "\\mathrm{I}")
(mathJ "\\mathrm{J}")
(mathK "\\mathrm{K}")
(mathL "\\mathrm{L}")
(mathM "\\mathrm{M}")
(mathN "\\mathrm{N}")
(mathO "\\mathrm{O}")
(mathP "\\mathrm{P}")
(mathQ "\\mathrm{Q}")
(mathR "\\mathrm{R}")
(mathS "\\mathrm{S}")
(mathT "\\mathrm{T}")
(mathU "\\mathrm{U}")
(mathV "\\mathrm{V}")
(mathW "\\mathrm{W}")
(mathX "\\mathrm{X}")
(mathY "\\mathrm{Y}")
(mathZ "\\mathrm{Z}")
(matha "\\mathrm{a}")
(mathb "\\mathrm{b}")
(mathc "\\mathrm{c}")
(mathd "\\mathrm{d}")
(mathD "\\mathrm{D}")
(mathe "\\mathrm{e}")
(mathf "\\mathrm{f}")
(mathg "\\mathrm{g}")
(mathh "\\mathrm{h}")
(mathi "\\mathrm{i}")
(mathj "\\mathrm{j}")
(mathk "\\mathrm{k}")
(mathl "\\mathrm{l}")
(mathm "\\mathrm{m}")
(mathn "\\mathrm{n}")
(matho "\\mathrm{o}")
(mathp "\\mathrm{p}")
(mathq "\\mathrm{q}")
(mathr "\\mathrm{r}")
(maths "\\mathrm{s}")
(matht "\\mathrm{t}")
(mathu "\\mathrm{u}")
(mathv "\\mathrm{v}")
(mathw "\\mathrm{w}")
(mathx "\\mathrm{x}")
(mathy "\\mathrm{y}")
(mathz "\\mathrm{z}")
(matheuler "\\gamma")
(mathGamma "\\Gamma")
(mathlambda "\\lambda")
(mathLaplace "\\Delta")
(mathi "\\mathrm{i}")
(mathpi "\\pi")
(Alpha "\\mathrm{A}")
(Beta "\\mathrm{B}")
Expand Down
8 changes: 6 additions & 2 deletions TeXmacs/progs/convert/latex/latex-texmacs-drd.scm
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@
divides ndivides asterisk dottimes precdot

;; extra literal symbols
mathcatalan mathd mathD mathe matheuler
mathGamma mathlambda mathLaplace mathi mathpi
mathcatalan mathA mathB mathC mathD mathE mathF mathG mathH mathI
mathJ mathK mathL mathM mathN mathO mathP mathQ mathR mathS mathT
mathU mathV mathW mathX mathY mathZ matha mathb mathc mathd mathD
mathe mathf mathg mathh mathi mathj mathk mathl mathm mathn matho
mathp mathq mathr maths matht mathu mathv mathw mathx mathy mathz
matheuler mathGamma mathlambda mathLaplace mathpi
Alpha Beta Epsilon Eta Iota Kappa Mu Nu Omicron Chi Rho Tau Zeta

;; negations
Expand Down
11 changes: 11 additions & 0 deletions TeXmacs/progs/language/std-symbols.scm
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,17 @@

"<mathe>" "<mathi>" "<mathlambda>" "<mathpi>"
"<matheuler>" "<mathcatalan>" "<mathGamma>"
"<mathA>" "<mathB>" "<mathC>" "<mathD>" "<mathE>"
"<mathF>" "<mathG>" "<mathH>" "<mathI>" "<mathJ>"
"<mathK>" "<mathL>" "<mathM>" "<mathN>" "<mathO>"
"<mathP>" "<mathQ>" "<mathR>" "<mathS>" "<mathT>"
"<mathU>" "<mathV>" "<mathW>" "<mathX>" "<mathY>"
"<mathZ>"
"<matha>" "<mathb>" "<mathc>" "<mathd>" "<mathf>"
"<mathg>" "<mathh>" "<mathj>" "<mathk>" "<mathl>"
"<mathm>" "<mathn>" "<matho>" "<mathp>" "<mathq>"
"<mathr>" "<maths>" "<matht>" "<mathu>" "<mathv>"
"<mathw>" "<mathx>" "<mathy>" "<mathz>"
"<aleph>" "<beth>" "<gimel>" "<daleth>"
"<hbar>" "<hslash>" "<wp>" "<digamma>"
"<imath>" "<b-imath>" "<jmath>" "<b-jmath>" "<ell>" "<b-ell>"
Expand Down
12 changes: 6 additions & 6 deletions TeXmacs/progs/math/math-edit.scm
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ list | boolean
(rb (caddr body)))
`(symbol-completion
,(string-append lb rb)))))
;; Case 4: math-separator
;; Case 4: math-separator
((math-separator)
(and (string? (cadr body))
`(symbol-completion
Expand All @@ -847,7 +847,7 @@ list | boolean
(- (string-length (cadr body)) 1))
(cadr body)) ">")))))
;; 预留位置:可以在此添加其他函数的处理逻辑

(else #f)))))))))))

#|
Expand Down Expand Up @@ -998,17 +998,17 @@ list
;; 情况 B: 绑定是函数 (例如 math-big-operator 的闭包)
((procedure? raw-cmd)
;; 利用 function-to-symbol 解析
(let ((parsed (function-to-symbol res)))
(let ((parsed (function-to-symbol res)))
;; function-to-symbol 返回的是 (symbol-completion "名字")
(if (and (pair? parsed)
(eq? (car parsed) 'symbol-completion))
(cadr parsed)
#f)))

(else #f))))

(if (string? bind-name)
(map (lambda (x)
(map (lambda (x)
(if (and (pair? x)
(eq? (car x) 'symbol-completion)
;; 用解析出来的 bind-name 进行比对
Expand Down
Loading