Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148677
Change subject: Regularize spacing in `texvccheck`
......................................................................
Regularize spacing in `texvccheck`
Tweak the position of spaces between function invocations and arguments
so that the expansion of mediawiki-specific functions (`\Rho`, etc) is
consistent with how spacing is added to normal function invocations.
This helps ensure that `texvccheck` is idempotent -- that is, that it
can parse what it emits, and render it without change.
Change-Id: I05fc8fa0201debf611ed4900d3cc953a6a8188ac
---
M texvccheck/lexer.mll
M texvccheck/texutil.ml
2 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/77/148677/1
diff --git a/texvccheck/lexer.mll b/texvccheck/lexer.mll
index 2f77dfc..79a9d07 100644
--- a/texvccheck/lexer.mll
+++ b/texvccheck/lexer.mll
@@ -64,10 +64,10 @@
| "\\" (latex_function_names as name) space * "[" { LITERAL (TEX_ONLY ("\\"
^ name ^ "[") )}
| "\\" (latex_function_names as name) space * "\\{" { LITERAL (TEX_ONLY
("\\" ^ name ^ "\\{")) }
| "\\" (latex_function_names as name) space * { LITERAL (TEX_ONLY("\\" ^
name ^ " ")) }
- | "\\" (mediawiki_function_names as name) space * "(" { ( LITERAL
(TEX_ONLY ("\\operatorname{" ^ name ^ "}("))) }
- | "\\" (mediawiki_function_names as name) space * "[" { ( LITERAL
(TEX_ONLY ("\\operatorname{" ^ name ^ "}[")))}
- | "\\" (mediawiki_function_names as name) space * "\\{" { ( LITERAL
(TEX_ONLY ("\\operatorname{" ^ name ^ "}\\{")))}
- | "\\" (mediawiki_function_names as name) space * { ( LITERAL
(TEX_ONLY ("\\operatorname{" ^ name ^ "} "))) }
+ | "\\" (mediawiki_function_names as name) space * "(" { ( LITERAL
(TEX_ONLY ("\\operatorname {" ^ name ^ "}("))) }
+ | "\\" (mediawiki_function_names as name) space * "[" { ( LITERAL
(TEX_ONLY ("\\operatorname {" ^ name ^ "}[")))}
+ | "\\" (mediawiki_function_names as name) space * "\\{" { ( LITERAL
(TEX_ONLY ("\\operatorname {" ^ name ^ "}\\{")))}
+ | "\\" (mediawiki_function_names as name) space * { ( LITERAL
(TEX_ONLY ("\\operatorname {" ^ name ^ "} "))) }
| "\\" alpha + { Texutil.find (Lexing.lexeme lexbuf) }
| "\\," { LITERAL (TEX_ONLY "\\,") }
| "\\ " { LITERAL (TEX_ONLY "\\ ") }
diff --git a/texvccheck/texutil.ml b/texvccheck/texutil.ml
index d8d9a1f..f72213a 100644
--- a/texvccheck/texutil.ml
+++ b/texvccheck/texutil.ml
@@ -603,12 +603,12 @@
| "\\varstigma"
-> LITERAL ( TEX_ONLY( "\\mbox{" ^ cmd ^ "} " ) )
- | "\\C" -> LITERAL ( TEX_ONLY( "\\mathbb{C}" ^ " " ) )
- | "\\H" -> LITERAL ( TEX_ONLY( "\\mathbb{H}" ^ " " ) )
- | "\\N" -> LITERAL ( TEX_ONLY( "\\mathbb{N}" ^ " " ) )
- | "\\Q" -> LITERAL ( TEX_ONLY( "\\mathbb{Q}" ^ " " ) )
- | "\\R" -> LITERAL ( TEX_ONLY( "\\mathbb{R}" ^ " " ) )
- | "\\Z" -> LITERAL ( TEX_ONLY( "\\mathbb{Z }" ^ " " ) )
+ | "\\C" -> LITERAL ( TEX_ONLY( "\\mathbb {C}" ^ " " ) )
+ | "\\H" -> LITERAL ( TEX_ONLY( "\\mathbb {H}" ^ " " ) )
+ | "\\N" -> LITERAL ( TEX_ONLY( "\\mathbb {N}" ^ " " ) )
+ | "\\Q" -> LITERAL ( TEX_ONLY( "\\mathbb {Q}" ^ " " ) )
+ | "\\R" -> LITERAL ( TEX_ONLY( "\\mathbb {R}" ^ " " ) )
+ | "\\Z" -> LITERAL ( TEX_ONLY( "\\mathbb {Z}" ^ " " ) )
| "\\darr" -> DELIMITER( TEX_ONLY( "\\downarrow" ^ " " ) )
| "\\dArr" -> DELIMITER( TEX_ONLY( "\\Downarrow" ^ " " ) )
@@ -624,23 +624,23 @@
| "\\alef" -> LITERAL ( TEX_ONLY( "\\aleph" ^ " " ) )
| "\\alefsym" -> LITERAL ( TEX_ONLY( "\\aleph" ^ " " ) )
- | "\\Alpha" -> LITERAL ( TEX_ONLY( "\\mathrm{A}" ^ " " ) )
+ | "\\Alpha" -> LITERAL ( TEX_ONLY( "\\mathrm {A}" ^ " " ) )
| "\\and" -> LITERAL ( TEX_ONLY( "\\land" ^ " " ) )
| "\\ang" -> LITERAL ( TEX_ONLY( "\\angle" ^ " " ) )
- | "\\Beta" -> LITERAL ( TEX_ONLY( "\\mathrm{B}" ^ " " ) )
+ | "\\Beta" -> LITERAL ( TEX_ONLY( "\\mathrm {B}" ^ " " ) )
| "\\bull" -> LITERAL ( TEX_ONLY( "\\bullet" ^ " " ) )
- | "\\Chi" -> LITERAL ( TEX_ONLY( "\\mathrm{X}" ^ " " ) )
+ | "\\Chi" -> LITERAL ( TEX_ONLY( "\\mathrm {X}" ^ " " ) )
| "\\clubs" -> LITERAL ( TEX_ONLY( "\\clubsuit" ^ " " ) )
- | "\\cnums" -> LITERAL ( TEX_ONLY( "\\mathbb{C}" ^ " " ) )
- | "\\Complex" -> LITERAL ( TEX_ONLY( "\\mathbb{C}" ^ " " ) )
+ | "\\cnums" -> LITERAL ( TEX_ONLY( "\\mathbb {C}" ^ " " ) )
+ | "\\Complex" -> LITERAL ( TEX_ONLY( "\\mathbb {C}" ^ " " ) )
| "\\Dagger" -> LITERAL ( TEX_ONLY( "\\ddagger" ^ " " ) )
| "\\diamonds" -> LITERAL ( TEX_ONLY( "\\diamondsuit" ^ " " ) )
| "\\Doteq" -> LITERAL ( TEX_ONLY( "\\doteqdot" ^ " " ) )
| "\\doublecap" -> LITERAL ( TEX_ONLY( "\\Cap" ^ " " ) )
| "\\doublecup" -> LITERAL ( TEX_ONLY( "\\Cup" ^ " " ) )
| "\\empty" -> LITERAL ( TEX_ONLY( "\\emptyset" ^ " " ) )
- | "\\Epsilon" -> LITERAL ( TEX_ONLY( "\\mathrm{E}" ^ " " ) )
- | "\\Eta" -> LITERAL ( TEX_ONLY( "\\mathrm{H}" ^ " " ) )
+ | "\\Epsilon" -> LITERAL ( TEX_ONLY( "\\mathrm {E}" ^ " " ) )
+ | "\\Eta" -> LITERAL ( TEX_ONLY( "\\mathrm {H}" ^ " " ) )
| "\\exist" -> LITERAL ( TEX_ONLY( "\\exists" ^ " " ) )
| "\\ge" -> LITERAL ( TEX_ONLY( "\\geq" ^ " " ) )
| "\\gggtr" -> LITERAL ( TEX_ONLY( "\\ggg" ^ " " ) )
@@ -650,9 +650,9 @@
| "\\hearts" -> LITERAL ( TEX_ONLY( "\\heartsuit" ^ " " ) )
| "\\image" -> LITERAL ( TEX_ONLY( "\\Im" ^ " " ) )
| "\\infin" -> LITERAL ( TEX_ONLY( "\\infty" ^ " " ) )
- | "\\Iota" -> LITERAL ( TEX_ONLY( "\\mathrm{I}" ^ " " ) )
+ | "\\Iota" -> LITERAL ( TEX_ONLY( "\\mathrm {I}" ^ " " ) )
| "\\isin" -> LITERAL ( TEX_ONLY( "\\in" ^ " " ) )
- | "\\Kappa" -> LITERAL ( TEX_ONLY( "\\mathrm{K}" ^ " " ) )
+ | "\\Kappa" -> LITERAL ( TEX_ONLY( "\\mathrm {K}" ^ " " ) )
| "\\larr" -> LITERAL ( TEX_ONLY( "\\leftarrow" ^ " " ) )
| "\\Larr" -> LITERAL ( TEX_ONLY( "\\Leftarrow" ^ " " ) )
| "\\lArr" -> LITERAL ( TEX_ONLY( "\\Leftarrow" ^ " " ) )
@@ -660,13 +660,13 @@
| "\\lrarr" -> LITERAL ( TEX_ONLY( "\\leftrightarrow" ^ " " ) )
| "\\Lrarr" -> LITERAL ( TEX_ONLY( "\\Leftrightarrow" ^ " " ) )
| "\\lrArr" -> LITERAL ( TEX_ONLY( "\\Leftrightarrow" ^ " " ) )
- | "\\Mu" -> LITERAL ( TEX_ONLY( "\\mathrm{M}" ^ " " ) )
- | "\\natnums" -> LITERAL ( TEX_ONLY( "\\mathbb{N}" ^ " " ) )
+ | "\\Mu" -> LITERAL ( TEX_ONLY( "\\mathrm {M}" ^ " " ) )
+ | "\\natnums" -> LITERAL ( TEX_ONLY( "\\mathbb {N}" ^ " " ) )
| "\\ne" -> LITERAL ( TEX_ONLY( "\\neq" ^ " " ) )
- | "\\Nu" -> LITERAL ( TEX_ONLY( "\\mathrm{N}" ^ " " ) )
+ | "\\Nu" -> LITERAL ( TEX_ONLY( "\\mathrm {N}" ^ " " ) )
| "\\O" -> LITERAL ( TEX_ONLY( "\\emptyset" ^ " " ) )
- | "\\omicron" -> LITERAL ( TEX_ONLY( "\\mathrm{o}" ^ " " ) )
- | "\\Omicron" -> LITERAL ( TEX_ONLY( "\\mathrm{O}" ^ " " ) )
+ | "\\omicron" -> LITERAL ( TEX_ONLY( "\\mathrm {o}" ^ " " ) )
+ | "\\Omicron" -> LITERAL ( TEX_ONLY( "\\mathrm {O}" ^ " " ) )
| "\\or" -> LITERAL ( TEX_ONLY( "\\lor" ^ " " ) )
| "\\part" -> LITERAL ( TEX_ONLY( "\\partial" ^ " " ) )
| "\\plusmn" -> LITERAL ( TEX_ONLY( "\\pm" ^ " " ) )
@@ -674,21 +674,21 @@
| "\\Rarr" -> LITERAL ( TEX_ONLY( "\\Rightarrow" ^ " " ) )
| "\\rArr" -> LITERAL ( TEX_ONLY( "\\Rightarrow" ^ " " ) )
| "\\real" -> LITERAL ( TEX_ONLY( "\\Re" ^ " " ) )
- | "\\reals" -> LITERAL ( TEX_ONLY( "\\mathbb{R}" ^ " " ) )
- | "\\Reals" -> LITERAL ( TEX_ONLY( "\\mathbb{R}" ^ " " ) )
+ | "\\reals" -> LITERAL ( TEX_ONLY( "\\mathbb {R}" ^ " " ) )
+ | "\\Reals" -> LITERAL ( TEX_ONLY( "\\mathbb {R}" ^ " " ) )
| "\\restriction" -> LITERAL ( TEX_ONLY( "\\upharpoonright" ^ " " ) )
- | "\\Rho" -> LITERAL ( TEX_ONLY( "\\mathrm{P}" ^ " " ) )
+ | "\\Rho" -> LITERAL ( TEX_ONLY( "\\mathrm {P}" ^ " " ) )
| "\\sdot" -> LITERAL ( TEX_ONLY( "\\cdot" ^ " " ) )
| "\\sect" -> LITERAL ( TEX_ONLY( "\\S" ^ " " ) )
| "\\spades" -> LITERAL ( TEX_ONLY( "\\spadesuit" ^ " " ) )
| "\\sub" -> LITERAL ( TEX_ONLY( "\\subset" ^ " " ) )
| "\\sube" -> LITERAL ( TEX_ONLY( "\\subseteq" ^ " " ) )
| "\\supe" -> LITERAL ( TEX_ONLY( "\\supseteq" ^ " " ) )
- | "\\Tau" -> LITERAL ( TEX_ONLY( "\\mathrm{T}" ^ " " ) )
+ | "\\Tau" -> LITERAL ( TEX_ONLY( "\\mathrm {T}" ^ " " ) )
| "\\thetasym" -> LITERAL ( TEX_ONLY( "\\vartheta" ^ " " ) )
| "\\varcoppa" -> LITERAL ( TEX_ONLY( "\\mbox{\\coppa}" ^ " " ) )
| "\\weierp" -> LITERAL ( TEX_ONLY( "\\wp" ^ " " ) )
- | "\\Zeta" -> LITERAL ( TEX_ONLY( "\\mathrm{Z}" ^ " " ) )
+ | "\\Zeta" -> LITERAL ( TEX_ONLY( "\\mathrm {Z}" ^ " " ) )
| "\\rm"
| "\\it"
--
To view, visit https://gerrit.wikimedia.org/r/148677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05fc8fa0201debf611ed4900d3cc953a6a8188ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
