From f8bca0e161705fc99fffd248ed4be897e940b2df Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Tue, 14 Apr 2015 01:33:19 +0200
Subject: Allow non-Greedy short form to eat normal commands.

E.g. with regrads to the math ontology, this change allows syntax like

\(a^\frac{1}{2}\)

which is also valid in TeX (added corresponding tests).
---
 .../user_defined_syntax/math_various.in.osml        |  3 ++-
 .../user_defined_syntax/math_various.out.osxml      | 21 +++++++++++++++++++++
 .../non_greedy_shortform.in.osml                    |  2 +-
 .../non_greedy_shortform.out.osxml                  |  4 ++++
 4 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'testdata')

diff --git a/testdata/integration/user_defined_syntax/math_various.in.osml b/testdata/integration/user_defined_syntax/math_various.in.osml
index f251bff..8433777 100644
--- a/testdata/integration/user_defined_syntax/math_various.in.osml
+++ b/testdata/integration/user_defined_syntax/math_various.in.osml
@@ -3,5 +3,6 @@
 	\sum_{i=5}^10 \\
 	\int_{\var{x} -> -1}^{\var{x} -> 1} \sqrt{x^{2} - 1} dx &= \frac{π}{2}\\
 	\fun{f}{x, y} |-> \frac{x^{2}}{2} + y^2\\
-	$ a ^ 2 + \var{b}^2 &= $c^{2}
+	$ a ^ 2 + \var{b}^2 &= $c^{2} \\
+	a^\frac{1}{2} &= \sqrt{a}
 \end{math}
diff --git a/testdata/integration/user_defined_syntax/math_various.out.osxml b/testdata/integration/user_defined_syntax/math_various.out.osxml
index 37b8ef8..efaed3e 100644
--- a/testdata/integration/user_defined_syntax/math_various.out.osxml
+++ b/testdata/integration/user_defined_syntax/math_various.out.osxml
@@ -105,5 +105,26 @@
 				</math:power>
 			</math:field>
 		</math:equation>
+		<math:equation>
+			<math:field>
+				<math:text>a</math:text>
+				<math:power>
+					<math:frac>
+						<denominator>
+							<math:number>1</math:number>
+						</denominator>
+						<nominator>
+							<math:number>2</math:number>
+						</nominator>
+					</math:frac>
+				</math:power>
+			</math:field>
+			<math:field>
+				<math:equals/>
+				<math:sqrt base="2">
+					<math:text>a</math:text>
+				</math:sqrt>
+			</math:field>
+		</math:equation>
 	</math:math>
 </document>
diff --git a/testdata/integration/user_defined_syntax/non_greedy_shortform.in.osml b/testdata/integration/user_defined_syntax/non_greedy_shortform.in.osml
index 0d700c2..3db0666 100644
--- a/testdata/integration/user_defined_syntax/non_greedy_shortform.in.osml
+++ b/testdata/integration/user_defined_syntax/non_greedy_shortform.in.osml
@@ -1,2 +1,2 @@
 \import[ontology]{./ontologies/non_greedy_shortform}
-\begin{test}?a ?b?c ??d + ?+{?} ??e f\end{test}
+\begin{test}?a ?b?c +\a{+}\a{+} ??d + ?+{?} ??e f\end{test}
diff --git a/testdata/integration/user_defined_syntax/non_greedy_shortform.out.osxml b/testdata/integration/user_defined_syntax/non_greedy_shortform.out.osxml
index 3ca0913..c2bcc83 100644
--- a/testdata/integration/user_defined_syntax/non_greedy_shortform.out.osxml
+++ b/testdata/integration/user_defined_syntax/non_greedy_shortform.out.osxml
@@ -4,6 +4,10 @@
 		<test:a>a</test:a>
 		<test:a>b</test:a>
 		<test:a>c</test:a>
+		<test:b>
+			<test:a>+</test:a>
+		</test:b>
+		<test:a>+</test:a>
 		<test:a/>
 		<test:a>d</test:a>
 		<test:b/>
-- 
cgit v1.2.3