From d35bc8d3d55e347d4725de5e7b8cc33bcb4e65d3 Mon Sep 17 00:00:00 2001
From: Todd Lewis <utoddl@email.unc.edu>
Date: Thu, 4 May 2017 20:13:50 -0400
Subject: [PATCH] yaml: handle plain strings w/ non-initial quotes

---
 yaml.jsf | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/yaml.jsf b/yaml.jsf
index 810d9f5..0ebe7e0 100644
--- a/yaml.jsf
+++ b/yaml.jsf
@@ -23,11 +23,15 @@
 	"#"		line_comment	recolor=-1
 	" "		line_start
 
+:maybe_idlecomment Comment
+	*		idle		noeat
+	"#"		line_comment	recolor=-1
+
 :idle Constant
-	*		idle
+	*		plain_scalar	noeat
 	"\n"		line_start
+	" "		maybe_idlecomment
 	"%"		directive	recolor=-1
-	" "		maybe_line_comment
 	"'"		string_sq_1	recolor=-1
 	"\""		string_dq_1	recolor=-1
 	"{[]}"		brace		recolor=-1
@@ -35,9 +39,15 @@
 	"*&"		maybe_reference
 	"!"		maybe_typecast
 
+:plain_scalar Constant
+	*		plain_scalar
+	"\t"		bad_tab		recolor=-1
+	"\n"		line_start	noeat
+
 :maybe_key Idle
 	*		maybe_key1	recolor=-1 mark
-	"\n%#'\"{[]}*&!"	idle		noeat
+	"\n"		line_start
+	"%#'\"{[]}*&!"	idle		noeat
 	"-"		maybe_block1	mark
 
 :maybe_key1 Constant
@@ -56,10 +66,6 @@
 :bad_tab BadTab
 	*		line_start	noeat
 
-:maybe_line_comment Comment
-	*		idle		noeat
-	"#"		line_comment
-
 :line_comment Comment
 	*		line_comment
 	"\n"		line_start