diff --git a/org/drawer.go b/org/drawer.go index 239d524..fc8d936 100644 --- a/org/drawer.go +++ b/org/drawer.go @@ -16,7 +16,7 @@ type PropertyDrawer struct { var beginDrawerRegexp = regexp.MustCompile(`^(\s*):(\S+):\s*$`) var endDrawerRegexp = regexp.MustCompile(`^(\s*):END:\s*$`) -var propertyRegexp = regexp.MustCompile(`^(\s*):(\S+):(\s+(.*)$|\s*$)`) +var propertyRegexp = regexp.MustCompile(`^(\s*):(\S+):(\s+(.*)$|$)`) func lexDrawer(line string) (token, bool) { if m := endDrawerRegexp.FindStringSubmatch(line); m != nil { diff --git a/org/footnote.go b/org/footnote.go index 7032a22..860e8bc 100644 --- a/org/footnote.go +++ b/org/footnote.go @@ -16,7 +16,7 @@ type FootnoteDefinition struct { Inline bool } -var footnoteDefinitionRegexp = regexp.MustCompile(`^\[fn:([\w-]+)\](\s+(.+)|$)`) +var footnoteDefinitionRegexp = regexp.MustCompile(`^\[fn:([\w-]+)\](\s+(.+)|\s*$)`) func lexFootnoteDefinition(line string) (token, bool) { if m := footnoteDefinitionRegexp.FindStringSubmatch(line); m != nil { diff --git a/org/keyword.go b/org/keyword.go index 01b7c95..512f33d 100644 --- a/org/keyword.go +++ b/org/keyword.go @@ -30,7 +30,7 @@ type Include struct { Resolve func() Node } -var keywordRegexp = regexp.MustCompile(`^(\s*)#\+([^:]+):(\s+(.*)|(\s*)$)`) +var keywordRegexp = regexp.MustCompile(`^(\s*)#\+([^:]+):(\s+(.*)|$)`) var commentRegexp = regexp.MustCompile(`^(\s*)#(.*)`) var includeFileRegexp = regexp.MustCompile(`(?i)^"([^"]+)" (src|example|export) (\w+)$`) diff --git a/org/list.go b/org/list.go index 63f89b4..82722d0 100644 --- a/org/list.go +++ b/org/list.go @@ -25,8 +25,8 @@ type DescriptiveListItem struct { Details []Node } -var unorderedListRegexp = regexp.MustCompile(`^(\s*)([+*-])(\s+(.*)|\s*$)`) -var orderedListRegexp = regexp.MustCompile(`^(\s*)(([0-9]+|[a-zA-Z])[.)])(\s+(.*)|\s*$)`) +var unorderedListRegexp = regexp.MustCompile(`^(\s*)([+*-])(\s+(.*)|$)`) +var orderedListRegexp = regexp.MustCompile(`^(\s*)(([0-9]+|[a-zA-Z])[.)])(\s+(.*)|$)`) var descriptiveListItemRegexp = regexp.MustCompile(`\s::(\s|$)`) var listItemStatusRegexp = regexp.MustCompile(`\[( |X|-)\]\s`)