git.iko.soy/Mathdown
on 2718878 help sign in
bbc0a21
swap
0 ahead, 2 behind
Mathdown/Mathdown/main.swift+12−63
since splitsnapshots
unifiedsplit
@@ -149,63 +149,7 @@ func process(element: Element) -> String {
149 }
149 }
150 }
150 }
151
151
152− func process(lineElement: Substring, withAttributes attributes: String = "", style: ElementStyle = .none) -> Substring {
152+
153− func extractNextElement(from line: Substring) -> (element: Substring, left: Substring) {
154− if line.first != "(" {
155− var i = line.startIndex
156− var el: Substring = ""
157− while i < line.endIndex && CharacterSet.alphanumerics.contains(line[i].unicodeScalars.first!) {
158− el.append(line[i])
159− i = line.index(after: i)
160− }
161− return (el, line[i...])
162− } else {
163− var brackets = 0
164− var i = line.startIndex
165− var el: Substring = ""
166− while i < line.endIndex {
167− switch el[i] {
168− case "(":
169− brackets += 1
170− case ")":
171− brackets -= 1
172− default:
173− break
174− }
175− i = line.index(after: i)
176− if brackets == 0 {
177− break
178− }
179− el.append(el[i])
180− }
181− if brackets != 0 {
182− print("Mismatched brackets")
183− exit(0)
184− }
185− return (el.dropFirst(), line[i...])
186− }
187− }
188− var i = lineElement.startIndex
189− while i < lineElement.endIndex {
190− switch lineElement[i] {
191− case "^":
192− let parts = extractNextElement(from: lineElement[lineElement.index(after: i)...])
193− return "<mo mathvariant=\"\(style.rawValue)\" \(attributes)>\(lineElement[..<i].filter({$0 != "\\"}))</mo>" + "<msup><mo></mo><mn>\(parts.element)</mn></msup>" + process(lineElement: parts.left, withAttributes: attributes, style: style)
194− case "!":
195− let parts = extractNextElement(from: lineElement[lineElement.index(after: i)...])
196− return "<mo mathvariant=\"\(style.rawValue)\" \(attributes)>\(lineElement[..<i].filter({$0 != "\\"}))</mo>" + "<mover accent=\"true\"><mrow><mo>\(parts.element)</mo></mrow><mo>_</mo></mover>" + process(lineElement: parts.left, withAttributes: attributes, style: style)
197− case "\\":
198− i = lineElement.index(after: i)
199− case "/":
200− let parts = extractNextElement(from: lineElement[lineElement.index(after: i)...])
201− return "<mo mathvariant=\"\(style.rawValue)\" \(attributes)>\(lineElement[..<i].filter({$0 != "\\"}))</mo>" + "<msub><mo></mo><mn>\(parts.element)</mn></msub>" + process(lineElement: parts.left, withAttributes: attributes, style: style)
202− default:
203− break
204− }
205− i = lineElement.index(after: i)
206− }
207− return Substring("<mo mathvariant=\"\(style.rawValue)\" \(attributes)>\(lineElement.filter({$0 != "\\"}))</mo>")
208− }
209 func process(line: Substring) {
153 func process(line: Substring) {
210 out.append("<mtr>")
154 out.append("<mtr>")
211 for element in line.split(
155 for element in line.split(
@@ -215,7 +159,7 @@ func process(element: Element) -> String {
215 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")
159 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")
216 default:
160 default:
217 let eStyle = element.style
161 let eStyle = element.style
218− out.append("<mtd>\(process(lineElement: Substring(element.trimmingStyleCharecters()), withAttributes: "height=\"0.8em\"", style: eStyle))</mtd>")
162+ out.append("<mtd><mn mathvariant=\"\(eStyle.rawValue)\" height=\"0.8em\">\(element.trimmingStyleCharecters())</mn></mtd>")
219 }
163 }
220 }
164 }
221 out.append("</mtr>")
165 out.append("</mtr>")
@@ -266,10 +210,15 @@ func process(element: Element) -> String {
266 out.append("\n\n<math><mtable>")
210 out.append("\n\n<math><mtable>")
267 break // TODO: Figure out what to do
211 break // TODO: Figure out what to do
268 case "[":
212 case "[":
213+ if !inMatrix {
269− out.append("<mtr><mtd><mrow><mo stretchy=\"true\">\(style.opening)</mo><mtable>")
214+ out.append("<mtr><mtd><mrow><mo stretchy=\"true\">\(style.opening)</mo><mtable>")
270− inMatrix = true
215+ inMatrix = true
271− first = true
216+ first = true
272− continue
217+ continue
218+ } else {
219+ print("Inconsistent syntax. Opening a matrix from within a matrix.")
220+ exit(0)
221+ }
273 case "":
222 case "":
274 if !first {
223 if !first {
275 out.append("</mtable><mtable>")
224 out.append("</mtable><mtable>")
@@ -279,7 +228,7 @@ func process(element: Element) -> String {
279 case let l where arrows.contains(l.first!.unicodeScalars.first!):
228 case let l where arrows.contains(l.first!.unicodeScalars.first!):
280 out.append("<mtr><mtd><mo>\(line)</mo></mtd></mtr>")
229 out.append("<mtr><mtd><mo>\(line)</mo></mtd></mtr>")
281 default:
230 default:
282− out.append("<mtr><mtd>\(small ? "<mstyle scriptlevel=\"1\">" : "")\(process(lineElement: Substring(line)))\(small ? "</mstyle>" : "")</mtd></mtr>")
231+ out.append("<mtr><mtd>\(small ? "<mstyle scriptlevel=\"1\">" : "")<mo>\(line)</mo>\(small ? "</mstyle>" : "")</mtd></mtr>")
283 }
232 }
284 }
233 }
285 first = false
234 first = false
README.md+1−1
@@ -56,7 +56,7 @@ a=2b
56```
56```
57![](images/mat4.png)
57![](images/mat4.png)
58
58
59−`#` is used to make a `separator` comment. It separates your expressions into different `<math>` elements and is converted to an `xml` comment in the output document.
59+`#` is used to make a `separator` comment. It separates your expressions into dedfferent `<math>` elements and is converted to an `xml` comment in the output document.
60
60
61## Usage
61## Usage
62`mathdown -b:r -i input.mth -o output.xml`
62`mathdown -b:r -i input.mth -o output.xml`