0b4ea8f..master · Mathdown

git.iko.soy/Mathdown

on master help sign in

Mathdown/Mathdown/main.swift+190−55

since splitsnapshots

unifiedsplit

@@ -8,6 +8,12 @@

9import Foundation

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,79 +105,209 @@ 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] = []

108

116

109− var out = "<math>"

117+ var small = false

110− let lines = mth.split(separator: "\n", omittingEmptySubsequences: false)

118+

111− .map {$0.trimmingCharacters(in: .whitespaces)}

119+ let arrows = CharacterSet.init(charactersIn: "⟺⟷⟼⟻⟶⟹⟵⟸")

112− var insideMatrix = false

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+ }

151+

152+ func process(lineElement: Substring, withAttributes attributes: String = "", style: ElementStyle = .none) -> Substring {

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+ }

113− func pureProcess(line: Substring) {

209+ func process(line: Substring) {

114 out.append("<mtr>")

210 out.append("<mtr>")

115 for element in line.split(

211 for element in line.split(

116− whereSeparator: {c in whitespace.contains(c.unicodeScalars.first!)}) {

212+ whereSeparator: {c in CharacterSet.whitespaces.contains(c.unicodeScalars.first!)}) {

117 switch element {

213 switch element {

118 case "_":

214 case "_":

119 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")

215 out.append("<mtd><mspace height=\"0.8em\"/></mtd>")

120 default:

216 default:

121 let eStyle = element.style

217 let eStyle = element.style

122− out.append("<mtd><mn mathvariant=\"\(eStyle.rawValue)\" height=\"0.8em\">\(element.trimmingStyleCharecters())</mn></mtd>")

218+ out.append("<mtd>\(process(lineElement: Substring(element.trimmingStyleCharecters()), withAttributes: "height=\"0.8em\"", style: eStyle))</mtd>")

123 }

219 }

124 }

220 }

125 out.append("</mtr>")

221 out.append("</mtr>")

126 }

222 }

127− func checkInsideMatrix() {

128− if insideMatrix {

129− if seperated {

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− }

140− }

141− func process(line: String.SubSequence) {

223+ func process(comment: String) {

142− switch line {

224+ if comment.hasPrefix("#") {

143− case "":

225+ out.append("")

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 }

226 }

152−

153 }

227 }

228+

154− for line in lines {

229+ for line in nEl {

155− if !insideMatrix {

230+ if inMatrix {

156− if lines.first?.contains("|") == true {

231+ if first && line.contains("|") {

157 seperated = true

232 seperated = true

158 }

233 }

159− }

234+ switch line {

160− if line == "" {

235+ case "]":

236+ if seperated {

237+ out.append("</mtable><mo stretchy=\"true\">|</mo><mtable>")

238+ for line in afterSeparator {

161− process(line: Substring(line))

239+ process(line: line)

240+ }

241+ }

242+ out.append("</mtable><mo stretchy=\"true\">\(style.closing)</mo></mrow></mtd></mtr>")

243+ inMatrix = false

244+ seperated = false

245+ afterSeparator = []

246+ default:

162− } else if seperated {

247+ if seperated {

163− let split = line.split(separator: "|", maxSplits: 1, omittingEmptySubsequences: false)

248+ let split = line.split(separator: "|", maxSplits: 1, omittingEmptySubsequences: false)

164− if split.count != 2 {

249+ if split.count != 2 {

165− print("Inconsistent syntax")

250+ print("Inconsistent syntax. The `|` seperator isn't consistent within a matrix.")

166− exit(0)

251+ exit(0)

252+ }

253+ process(line: split[0])

254+ afterSeparator.append(split[1])

255+ } else {

256+ process(line: Substring(line))

257+ }

167 }

258 }

168− process(line: split[0])

169− afterSeparator.append(split[1])

170 } else {

259 } else {

171− process(line: Substring(line))

260+ switch line {

261+ case let l where l.hasPrefix("//"):

262+ break

263+ case let l where l.hasPrefix("#"):

264+ out.append("</mtable></math>\n\n")

265+ process(comment: l)

266+ out.append("\n\n<math><mtable>")

267+ break // TODO: Figure out what to do

268+ case "[":

269+ out.append("<mtr><mtd><mrow><mo stretchy=\"true\">\(style.opening)</mo><mtable>")

270+ inMatrix = true

271+ first = true

272+ continue

273+ case "":

274+ if !first {

275+ out.append("</mtable><mtable>")

276+ }

277+ first = true

278+ continue

279+ case let l where arrows.contains(l.first!.unicodeScalars.first!):

280+ out.append("<mtr><mtd><mo>\(line)</mo></mtd></mtr>")

281+ default:

282+ out.append("<mtr><mtd>\(small ? "<mstyle scriptlevel=\"1\">" : "")\(process(lineElement: Substring(line)))\(small ? "</mstyle>" : "")</mtd></mtr>")

283+ }

172 }

284 }

285+ first = false

286+ }

287+ return out

288+}

289+

290+func process(mth: String) -> String {

291+ let elements = mth

292+ .split(separator: "\n", omittingEmptySubsequences: false)

293+ .map({$0.trimmingCharacters(in: .whitespaces)})

294+ .map({ l in

295+ var i = l.startIndex

296+ for u in 0..<max(0, l.count - 1) {

297+ if l[i] == "/" && l[l.index(after: i)] == "/" {

298+ return String(l.dropLast(l.count - u))

299+ }

300+ i = l.index(after: i)

301+ }

302+ return l

303+ })

304+ .split(separator: "")

305+ var out = "<math><mtable>"

306+ for el in elements {

307+ out.append(process(element: Array(el)))

308+ out.append("</mtable><mtable>")

173 }

309 }

174− checkInsideMatrix()

175− out.append("</math>")

310+ out.append("</mtable></math>")

176 return out

311 return out

177}

312}

178

313

README.md+34−4

@@ -4,8 +4,10 @@ Outputs [MathML](https://en.wikipedia.org/wiki/MathML) format.

5## Syntax

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)

@@ -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___

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)

23You can use `_` to leave an empty space in the matrix

27You can use `_` to leave an empty space in the matrix

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)

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 different `<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`

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.