git.iko.soy/Mathdown
on master help sign in
Slightly touched up the syntax and added comments.
2718878ilyakooo0
Mathdown/Mathdown/main.swift+138−54
compare with master
unifiedsplit
@@ -8,6 +8,12 @@
8
8
9import Foundation
9import Foundation
10
10
11+typealias Lines = [String]
12+typealias Element = [String]
13+let commentChars = CharacterSet.init(charactersIn: "#/")
14+let styleCharecters = CharacterSet.init(charactersIn: "_*")
15+
16+
11enum BracketStyle {
17enum BracketStyle {
12 case square
18 case square
13 case round
19 case round
@@ -61,11 +67,11 @@ default:
61 if let surl = args.popFirst() {
67 if let surl = args.popFirst() {
62 outputUrl = URL(fileURLWithPath: surl)
68 outputUrl = URL(fileURLWithPath: surl)
63 }
69 }
64− case "-s":
70+ case "-b:s":
65 style = .square
71 style = .square
66− case "-r":
72+ case "-b:r":
67 style = .round
73 style = .round
68− case "-l":
74+ case "-b:l":
69 style = .line
75 style = .line
70 default:
76 default:
71 return
77 return
@@ -81,7 +87,6 @@ enum ElementStyle: String {
81 case italic = "italic"
87 case italic = "italic"
82 case boldItalic = "bold-italic"
88 case boldItalic = "bold-italic"
83}
89}
84−let styleCharecters = CharacterSet.init(charactersIn: "_*")
85extension String.SubSequence {
90extension String.SubSequence {
86 var style: ElementStyle {
91 var style: ElementStyle {
87 let num = self.prefix(while: {styleCharecters.contains($0.unicodeScalars.first!)}).count
92 let num = self.prefix(while: {styleCharecters.contains($0.unicodeScalars.first!)}).count
@@ -100,20 +105,55 @@ extension String.SubSequence {
100 return self.trimmingCharacters(in: styleCharecters)
105 return self.trimmingCharacters(in: styleCharecters)
101 }
106 }
102}
107}
108+
103−func process(mth: String) -> String {
109+func process(element: Element) -> String {
104− let whitespace = CharacterSet.whitespaces
110+ var out = ""
105
111
112+ var inMatrix = false
113+ var first = false
106 var seperated = false
114 var seperated = false
107− var afterSeparator: [String.SubSequence] = []
115+ var afterSeparator: [Substring] = []
116+
117+ var small = false
118+
119+ let arrows = CharacterSet.init(charactersIn: "⟺⟷⟼⟻⟶⟹⟵⟸")
120+
121+ let nEl = element.map { (el) -> String in
122+ switch el {
123+ case let l where l.last == ">" && l.first == "<" && l.dropLast().dropFirst().filter({$0 == "="}).count > 0:
124+ small = true
125+ return "⟺"
126+ case let l where l.last == ">" && l.first == "<" && l.dropLast().dropFirst().filter({$0 == "-"}).count > 0:
127+ small = true
128+ return "⟷"
129+ case let l where l.last == ">" && l.first == "|" && l.dropLast().dropFirst().filter({$0 == "-"}).count > 0:
130+ small = true
131+ return "⟼"
132+ case let l where l.last == "|" && l.first == "<" && l.dropLast().dropFirst().filter({$0 == "-"}).count > 0:
133+ small = true
134+ return "⟻"
135+ case let l where l.last == ">" && l.dropLast().filter({$0 == "-"}).count > 0:
136+ small = true
137+ return "⟶"
138+ case let l where l.last == ">" && l.dropLast().filter({$0 == "="}).count > 0:
139+ small = true
140+ return "⟹"
141+ case let l where l.first == "<" && l.dropFirst().filter({$0 == "-"}).count > 0:
142+ small = true
143+ return "⟵"
144+ case let l where l.first == "<" && l.dropFirst().filter({$0 == "="}).count > 0:
145+ small = true
146+ return "⟸"
147+ default:
148+ return el
149+ }
150+ }
108
151
109− var out = "<math>"
152+
110− let lines = mth.split(separator: "\n", omittingEmptySubsequences: false)
111− .map {$0.trimmingCharacters(in: .whitespaces)}
112− var insideMatrix = false
113− func pureProcess(line: Substring) {
153+ func process(line: Substring) {
114 out.append("<mtr>")
154 out.append("<mtr>")
115 for element in line.split(
155 for element in line.split(
116− whereSeparator: {c in whitespace.contains(c.unicodeScalars.first!)}) {
156+ whereSeparator: {c in CharacterSet.whitespaces.contains(c.unicodeScalars.first!)}) {
117 switch element {
157 switch element {
118 case "_":
158 case "_":
119 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")
159 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")
@@ -124,55 +164,99 @@ func process(mth: String) -> String {
124 }
164 }
125 out.append("</mtr>")
165 out.append("</mtr>")
126 }
166 }
127− func checkInsideMatrix() {
167+ func process(comment: String) {
128− if insideMatrix {
168+ if comment.hasPrefix("#") {
129− if seperated {
169+ out.append("<!-- \(comment.trimmingCharacters(in: commentChars).trimmingCharacters(in: .whitespaces)) -->")
130− out.append("</mtable><mo>|</mo><mtable>")
131− for line in afterSeparator {
132− pureProcess(line: line)
133− }
134− }
135− out.append("</mtable><mo>\(style.closing)</mo></mrow>")
136− insideMatrix = false
137− seperated = false
138− afterSeparator = []
139 }
170 }
140 }
171 }
141− func process(line: String.SubSequence) {
172+
142− switch line {
143− case "":
144− checkInsideMatrix()
145− default:
146− if !insideMatrix {
147− out.append("<mrow><mo>\(style.opening)</mo><mtable>")
148− insideMatrix = true
149− }
150− pureProcess(line: line)
151− }
152−
153− }
154− for line in lines {
173+ for line in nEl {
155− if !insideMatrix {
174+ if inMatrix {
156− if lines.first?.contains("|") == true {
175+ if first && line.contains("|") {
157 seperated = true
176 seperated = true
158 }
177 }
159− }
178+ switch line {
160− if line == "" {
179+ case "]":
180+ if seperated {
181+ out.append("</mtable><mo stretchy=\"true\">|</mo><mtable>")
182+ for line in afterSeparator {
161− process(line: Substring(line))
183+ process(line: line)
184+ }
185+ }
186+ out.append("</mtable><mo stretchy=\"true\">\(style.closing)</mo></mrow></mtd></mtr>")
187+ inMatrix = false
188+ seperated = false
189+ afterSeparator = []
190+ default:
162− } else if seperated {
191+ if seperated {
163− let split = line.split(separator: "|", maxSplits: 1, omittingEmptySubsequences: false)
192+ let split = line.split(separator: "|", maxSplits: 1, omittingEmptySubsequences: false)
164− if split.count != 2 {
193+ if split.count != 2 {
165− print("Inconsistent syntax")
194+ print("Inconsistent syntax. The `|` seperator isn't consistent within a matrix.")
166− exit(0)
195+ exit(0)
196+ }
197+ process(line: split[0])
198+ afterSeparator.append(split[1])
199+ } else {
200+ process(line: Substring(line))
201+ }
167 }
202 }
168− process(line: split[0])
169− afterSeparator.append(split[1])
170 } else {
203 } else {
171− process(line: Substring(line))
204+ switch line {
205+ case let l where l.hasPrefix("//"):
206+ break
207+ case let l where l.hasPrefix("#"):
208+ out.append("</mtable></math>\n\n")
209+ process(comment: l)
210+ out.append("\n\n<math><mtable>")
211+ break // TODO: Figure out what to do
212+ case "[":
213+ if !inMatrix {
214+ out.append("<mtr><mtd><mrow><mo stretchy=\"true\">\(style.opening)</mo><mtable>")
215+ inMatrix = true
216+ first = true
217+ continue
218+ } else {
219+ print("Inconsistent syntax. Opening a matrix from within a matrix.")
220+ exit(0)
221+ }
222+ case "":
223+ if !first {
224+ out.append("</mtable><mtable>")
225+ }
226+ first = true
227+ continue
228+ case let l where arrows.contains(l.first!.unicodeScalars.first!):
229+ out.append("<mtr><mtd><mo>\(line)</mo></mtd></mtr>")
230+ default:
231+ out.append("<mtr><mtd>\(small ? "<mstyle scriptlevel=\"1\">" : "")<mo>\(line)</mo>\(small ? "</mstyle>" : "")</mtd></mtr>")
232+ }
172 }
233 }
234+ first = false
235+ }
236+ return out
237+}
238+
239+func process(mth: String) -> String {
240+ let elements = mth
241+ .split(separator: "\n", omittingEmptySubsequences: false)
242+ .map({$0.trimmingCharacters(in: .whitespaces)})
243+ .map({ l in
244+ var i = l.startIndex
245+ for u in 0..<max(0, l.count - 1) {
246+ if l[i] == "/" && l[l.index(after: i)] == "/" {
247+ return String(l.dropLast(l.count - u))
248+ }
249+ i = l.index(after: i)
250+ }
251+ return l
252+ })
253+ .split(separator: "")
254+ var out = "<math><mtable>"
255+ for el in elements {
256+ out.append(process(element: Array(el)))
257+ out.append("</mtable><mtable>")
173 }
258 }
174− checkInsideMatrix()
175− out.append("</math>")
259+ out.append("</mtable></math>")
176 return out
260 return out
177}
261}
178
262
README.md+34−4
@@ -4,8 +4,10 @@ Outputs [MathML](https://en.wikipedia.org/wiki/MathML) format.
4
4
5## Syntax
5## Syntax
6```
6```
7+[
71 2 3
81 2 3
83 2 8
93 2 8
10+]
9```
11```
10![](images/mat1.png)
12![](images/mat1.png)
11
13
@@ -15,25 +17,53 @@ You can also use [Markdown](https://en.wikipedia.org/wiki/Markdown)-style text e
15- `___<text>___` or `***<text>***` for ___italic and bold___
17- `___<text>___` or `***<text>***` for ___italic and bold___
16
18
17```
19```
20+[
18***1*** 2 __3__
21***1*** 2 __3__
19 3 _2_ 8
22 3 _2_ 8
23+]
20```
24```
21![](images/mat2.png)
25![](images/mat2.png)
22
26
23You can use `_` to leave an empty space in the matrix
27You can use `_` to leave an empty space in the matrix
24
28
25```
29```
30+[
26***1*** 2 __3__ | _
31***1*** 2 __3__ | _
27 _ _2_ 8 | 4
32 _ _2_ 8 | 4
33+]
28```
34```
29![](images/mat3.png)
35![](images/mat3.png)
30
36
37+Newlines separate `elements` of your expressions.
38+`//` denotes the start of a normal comment. It is not present in the output.
39+
40+```
41+[
42+***1*** 2 __3__ | _ // This is a normal comment
43+_ _2_ 8 | 4
44+]
45+
46+1⊕=0
47+->
48+a=2b
49+
50+// This is also a normal comment
51+
52+[
53+1 2
54+5 3
55+]
56+```
57+![](images/mat4.png)
58+
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+
31## Usage
61## Usage
32−`mathdown -r -i input.mth -o output.xml`
62+`mathdown -b:r -i input.mth -o output.xml`
33
63
34### Parameters
64### Parameters
35- `-i <file path>` Specifies the input path
65- `-i <file path>` Specifies the input path
36- `-o <file path>` Specifies the output pathfile
66- `-o <file path>` Specifies the output pathfile
37−- `-s` Uses square brackets
67+- `-b:s` Uses square brackets
38−- `-r` Uses round brackets
68+- `-b:r` Uses round brackets
39−- `-l` Uses line brackets
69+- `-b:l` Uses line brackets
images/mat4.pngnew file

Binary file not shown.