From 47a1b1a1f02c2a2509663820cf8e116ab2fb2dc3 Mon Sep 17 00:00:00 2001
From: cn <cn@mycrobase.de>
Date: Sat, 4 Feb 2017 23:40:52 +0100
Subject: [PATCH] Document yaml.jsf contributions

---
 README.md |  1 +
 yaml.jsf  | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 46f1251..be1c432 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ Files with contributions (or unclear license info):
 * [powershell.jsf](https://github.com/cmur2/joe-syntax/blob/master/powershell.jsf) which is entirely contributed by [Oskar Liljeblad](https://github.com/osklil) under GPL v2 or any later version ([comment](https://github.com/cmur2/joe-syntax/pull/5#issuecomment-76935968))
 * [puppet.jsf](https://github.com/cmur2/joe-syntax/blob/master/puppet.jsf) which is created by [Christian Nicolai](https://github.com/cmur2) and then modified by [Eric Eisenhart](https://github.com/eeisenhart)
 * [sql.jsf](https://github.com/cmur2/joe-syntax/blob/master/sql.jsf) which is from an "unknown source" (delivered by [Rebecca Turner](https://github.com/iarna))
+* [yaml.jsf](https://github.com/cmur2/joe-syntax/blob/master/yaml.jsf) which is created by [Christian Nicolai](https://github.com/cmur2) with bug fixes from [Todd Lewis](https://github.com/utoddl)
 
 ## Links
 
diff --git a/yaml.jsf b/yaml.jsf
index 350bd82..810d9f5 100644
--- a/yaml.jsf
+++ b/yaml.jsf
@@ -12,7 +12,7 @@
 
 =Directive	red
 =Reference	yellow
-=LocalType	blue
+=LocalType	fg_310 # brown
 =BlockDelim	bold blue
 
 =BadTab		inverse red
@@ -23,15 +23,11 @@
 	"#"		line_comment	recolor=-1
 	" "		line_start
 
-:maybe_idlecomment Comment
-	*		idle		noeat
-	"#"		line_comment	recolor=-1
-
 :idle Constant
 	*		idle
 	"\n"		line_start
-	" "		maybe_idlecomment
 	"%"		directive	recolor=-1
+	" "		maybe_line_comment
 	"'"		string_sq_1	recolor=-1
 	"\""		string_dq_1	recolor=-1
 	"{[]}"		brace		recolor=-1
@@ -41,8 +37,7 @@
 
 :maybe_key Idle
 	*		maybe_key1	recolor=-1 mark
-	"\n"		line_start
-	"%#'\"{[]}*&!"	idle		noeat
+	"\n%#'\"{[]}*&!"	idle		noeat
 	"-"		maybe_block1	mark
 
 :maybe_key1 Constant
@@ -61,6 +56,10 @@
 :bad_tab BadTab
 	*		line_start	noeat
 
+:maybe_line_comment Comment
+	*		idle		noeat
+	"#"		line_comment
+
 :line_comment Comment
 	*		line_comment
 	"\n"		line_start