From d133cab5cd263f282cc11e725599583d3cf09f9d Mon Sep 17 00:00:00 2001 From: "C. R. Oldham" Date: Thu, 13 Jun 2019 17:03:48 -0600 Subject: [PATCH 1/2] Allow _ in property names --- lib/org/lexer.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/org/lexer.ex b/lib/org/lexer.ex index 5abd894..35aef74 100644 --- a/lib/org/lexer.ex +++ b/lib/org/lexer.ex @@ -59,7 +59,7 @@ defmodule Org.Lexer do @empty_line_re ~r/^\s*$/ @table_row_re ~r/^\s*(?:\|[^|]*)+\|\s*$/ @begin_props_re ~r/^\s*\:PROPERTIES\:$/ - @property_re ~r/^\s*\:([A-Za-z]+)\:\s*(.+)$/ + @property_re ~r/^\s*\:([A-Za-z_]+)\:\s*(.+)$/ @end_drawer_re ~r/^\s*\:END\:$/ defp lex_line(line, %Org.Lexer{mode: :normal} = lexer) do From 094e81f82eb03fe9c2fcacf03f46269a427ff1b2 Mon Sep 17 00:00:00 2001 From: "C. R. Oldham" Date: Thu, 13 Jun 2019 20:55:28 -0600 Subject: [PATCH 2/2] Enhance test to check for valid _ in property name --- test/org/lexer_test.exs | 1 + test/org/parser_test.exs | 1 + test/org_test.exs | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/org/lexer_test.exs b/test/org/lexer_test.exs index 6384d69..2b5cd93 100644 --- a/test/org/lexer_test.exs +++ b/test/org/lexer_test.exs @@ -34,6 +34,7 @@ defmodule Org.LexerTest do {:property, "Artist", "Glenn Gould"}, {:property, "Publisher", "Deutsche Grammophon"}, {:property, "NDisks", "1"}, + {:property, "ARCHIVE_TIME", "2018-08-14 Tue 16:39"}, {:end_drawer}, {:text, "3"}, {:section_title, 4, "is nesting"}, diff --git a/test/org/parser_test.exs b/test/org/parser_test.exs index af46e40..ce7247e 100644 --- a/test/org/parser_test.exs +++ b/test/org/parser_test.exs @@ -39,6 +39,7 @@ defmodule Org.ParserTest do {:Artist, "Glenn Gould"}, {:Publisher, "Deutsche Grammophon"}, {:NDisks, "1"}, + {:ARCHIVE_TIME, "2018-08-14 Tue 16:39"}, ] end end diff --git a/test/org_test.exs b/test/org_test.exs index fb7491a..90ea2de 100644 --- a/test/org_test.exs +++ b/test/org_test.exs @@ -21,11 +21,12 @@ defmodule OrgTest do 2 *** thing :PROPERTIES: - :Title: Goldberg Variations - :Composer: J.S. Bach - :Artist: Glenn Gould - :Publisher: Deutsche Grammophon - :NDisks: 1 + :Title: Goldberg Variations + :Composer: J.S. Bach + :Artist: Glenn Gould + :Publisher: Deutsche Grammophon + :NDisks: 1 + :ARCHIVE_TIME: 2018-08-14 Tue 16:39 :END: 3 **** is nesting