From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Problem with property matching Date: Tue, 26 Nov 2013 22:12:14 +0100 Message-ID: <87ob5627gx.fsf@Rainer.invalid> References: <4EE54E6B-582D-4E9B-A641-520E37AC26EA@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlPvu-0000EX-NB for emacs-orgmode@gnu.org; Tue, 26 Nov 2013 16:12:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlPvo-0007rt-HN for emacs-orgmode@gnu.org; Tue, 26 Nov 2013 16:12:34 -0500 Received: from plane.gmane.org ([80.91.229.3]:56428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlPvo-0007ro-A2 for emacs-orgmode@gnu.org; Tue, 26 Nov 2013 16:12:28 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VlPvm-0004bn-8u for emacs-orgmode@gnu.org; Tue, 26 Nov 2013 22:12:26 +0100 Received: from pd9eb0f85.dip0.t-ipconnect.de ([217.235.15.133]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Nov 2013 22:12:26 +0100 Received: from Stromeko by pd9eb0f85.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Nov 2013 22:12:26 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Carsten Dominik writes: > I think there is an error in the property matching regexp. It will > not match a line where the property value is empty. See 3c933adaf6 and 68276fd62d for how this regex developed, the requirement of the whitespace after the colon was in the original regex from Nicolas. I think that makes sense given the description of properties as key-value pairs. In other places we use "()" for an empty value aka nil. > I propose the following change, which makes the value part optional: > -------------------------------------------------------------------------------- > diff --git a/lisp/org.el b/lisp/org.el > index 7a4d244..4641ce5 100644 > --- a/lisp/org.el > +++ b/lisp/org.el > @@ -6205,7 +6205,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." > Match group 3 will be set to the value if it exists." > (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:" > (if literal property (regexp-quote property)) > - "\\):\\)[ \t]+\\(?3:[^ \t\r\n].*?\\)\\(?5:[ \t]*\\)$")) > + "\\):\\)\\([ \t]+\\(?3:[^ \t\r\n].*?\\)\\)?\\(?5:[ \t]*\\)$")) The extra group introduced should be shy. > Why \\(?3:[^ \t\r\n].*?\\) instead of \\(?3:.*?\\) ? In fact, this would be preferred (you need whitespace after the colon for an empty key): --8<---------------cut here---------------start------------->8--- diff --git a/lisp/org.el b/lisp/org.el index c9055a6..d2aff2f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6203,7 +6203,7 @@ (defsubst org-re-property (property &optional literal) Match group 3 will be set to the value if it exists." (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:" (if literal property (regexp-quote property)) - "\\):\\)[ \t]+\\(?3:[^ \t\r\n].*?\\)\\(?5:[ \t]*\\)$")) + "\\):\\)[ \t]+\\(?3:.*?\\)\\(?5:[ \t]*\\)$")) (defconst org-property-re (org-re-property ".*?" 'literal) --8<---------------cut here---------------end--------------->8--- since it still passes the test suite (which may be accidental since I don't think there's any whitespace after :PROPERTIES: or :END: and we may actually need to enforce this). If you don't want to require whitespace after the colon for an empty key you'd do this: --8<---------------cut here---------------start------------->8--- diff --git a/lisp/org.el b/lisp/org.el index c9055a6..d2aff2f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6203,7 +6203,7 @@ (defsubst org-re-property (property &optional literal) Match group 3 will be set to the value if it exists." (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:" (if literal property (regexp-quote property)) - "\\):\\)[ \t]+\\(?3:[^ \t\r\n].*?\\)\\(?5:[ \t]*\\)$")) + "\\):\\)[ \t]*\\(?3:.*?\\)\\(?5:[ \t]*\\)$")) (defconst org-property-re (org-re-property ".*?" 'literal) --8<---------------cut here---------------end--------------->8--- but this fails Babel header arg tests. I don't think there's anything that specifically tests for empty values since it wasn't specified or possible so far, but this somehow messes up property inheritance. You'd need to explicitly disallow :PROPERTIES: and :END: as a key, since this will now be matched by the regex. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf Blofeld V1.15B11: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada