From 115a8b9c1b6d5ac3397b68e1db9d283439a92510 Mon Sep 17 00:00:00 2001
From: Niklas Fasching <niklas.fasching@gmail.com>
Date: Fri, 17 Jan 2020 00:55:11 +0100
Subject: [PATCH] Fix latex fragment parsing

delimiters are not always 2 in length - $ being the exception. Also we have to
make sure to handle both $ and $$ delimiters.

Not proud of this solution but can't think of anything simpler right now - will
come back to this later hopefully.
---
 org/inline.go                 | 18 +++++++++++-------
 org/testdata/latex.html       |  5 +++++
 org/testdata/latex.org        |  1 +
 org/testdata/latex.pretty_org |  1 +
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/org/inline.go b/org/inline.go
index c33701d..4ba0a96 100644
--- a/org/inline.go
+++ b/org/inline.go
@@ -66,6 +66,7 @@ var latexFragmentPairs = map[string]string{
 	`\(`: `\)`,
 	`\[`: `\]`,
 	`$$`: `$$`,
+	`$`:  `$`,
 }
 
 func (d *Document) parseInline(input string) (nodes []Node) {
@@ -88,7 +89,7 @@ func (d *Document) parseInline(input string) (nodes []Node) {
 		case '\\':
 			consumed, node = d.parseExplicitLineBreakOrLatexFragment(input, current)
 		case '$':
-			consumed, node = d.parseLatexFragment(input, current)
+			consumed, node = d.parseLatexFragment(input, current, 1)
 		case '\n':
 			consumed, node = d.parseLineBreak(input, current)
 		case ':':
@@ -153,7 +154,7 @@ func (d *Document) parseExplicitLineBreakOrLatexFragment(input string, start int
 			}
 		}
 	case input[start+1] == '(' || input[start+1] == '[':
-		return d.parseLatexFragment(input, start)
+		return d.parseLatexFragment(input, start, 2)
 	case strings.Index(input[start:], `\begin{`) == 0:
 		if m := latexFragmentRegexp.FindStringSubmatch(input[start:]); m != nil {
 			if open, content, close := m[1], m[2], m[3]; open == close {
@@ -166,15 +167,18 @@ func (d *Document) parseExplicitLineBreakOrLatexFragment(input string, start int
 	return 0, nil
 }
 
-func (d *Document) parseLatexFragment(input string, start int) (int, Node) {
+func (d *Document) parseLatexFragment(input string, start int, pairLength int) (int, Node) {
 	if start+2 >= len(input) {
 		return 0, nil
 	}
-	openingPair := input[start : start+2]
+	if pairLength == 1 && input[start:start+2] == "$$" {
+		pairLength = 2
+	}
+	openingPair := input[start : start+pairLength]
 	closingPair := latexFragmentPairs[openingPair]
-	if i := strings.Index(input[start+2:], closingPair); i != -1 {
-		content := d.parseRawInline(input[start+2 : start+2+i])
-		return i + 2 + 2, LatexFragment{openingPair, closingPair, content}
+	if i := strings.Index(input[start+pairLength:], closingPair); i != -1 {
+		content := d.parseRawInline(input[start+pairLength : start+pairLength+i])
+		return i + pairLength + pairLength, LatexFragment{openingPair, closingPair, content}
 	}
 	return 0, nil
 }
diff --git a/org/testdata/latex.html b/org/testdata/latex.html
index 45ef9ee..d0fefc5 100644
--- a/org/testdata/latex.html
+++ b/org/testdata/latex.html
@@ -35,4 +35,9 @@ $$\sum_{i=1}^n a_n$$
 \end{xyz}
 </p>
 </li>
+<li>
+<p>
+$2 + 2$, $3 - 3$
+</p>
+</li>
 </ul>
diff --git a/org/testdata/latex.org b/org/testdata/latex.org
index 9c27816..5a4c953 100644
--- a/org/testdata/latex.org
+++ b/org/testdata/latex.org
@@ -9,3 +9,4 @@ we support =\(...\)=, =\[...\]=, =$$...$$= and =\begin{$env}...\end{$env}= as la
 - \begin{xyz}
   \sum_{i=1}^n a_n
   \end{xyz}
+- $2 + 2$, $3 - 3$
diff --git a/org/testdata/latex.pretty_org b/org/testdata/latex.pretty_org
index 9c27816..5a4c953 100644
--- a/org/testdata/latex.pretty_org
+++ b/org/testdata/latex.pretty_org
@@ -9,3 +9,4 @@ we support =\(...\)=, =\[...\]=, =$$...$$= and =\begin{$env}...\end{$env}= as la
 - \begin{xyz}
   \sum_{i=1}^n a_n
   \end{xyz}
+- $2 + 2$, $3 - 3$