From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [patch] Terminating lists by indentation of #+SPECIALS too Date: Thu, 22 Apr 2010 10:22:50 +0200 Message-ID: <398E37C4-42A0-4928-83BA-8F4258FE5503@gmail.com> References: <877ho4e56t.fsf@gmx.de> <87zl10co57.fsf@gmx.de> <87ljcgiy96.fsf@gmx.de> <871ve846rv.fsf@gmx.de> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4rgZ-0003en-Qf for emacs-orgmode@gnu.org; Thu, 22 Apr 2010 04:22:59 -0400 Received: from [140.186.70.92] (port=38742 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4rgY-0003eX-Bb for emacs-orgmode@gnu.org; Thu, 22 Apr 2010 04:22:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4rgW-0001rc-4O for emacs-orgmode@gnu.org; Thu, 22 Apr 2010 04:22:58 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:51819) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4rgT-0001rA-Gu for emacs-orgmode@gnu.org; Thu, 22 Apr 2010 04:22:55 -0400 Received: by wyg36 with SMTP id 36so1347190wyg.0 for ; Thu, 22 Apr 2010 01:22:52 -0700 (PDT) In-Reply-To: <871ve846rv.fsf@gmx.de> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Sebastian Rose Cc: Emacs-orgmode mailing list Hi Sebastian, thanks or your patience - I have now aplied this patch. You are saying that your files "mostly validate". Are there issues we should address? Thanks! - Carsten On Apr 22, 2010, at 3:26 AM, Sebastian Rose wrote: > Carsten Dominik writes: >> Hi Sebastion, sorry for being hard to satisfy on this one. >> >> What I mean is this: >> >> The location where your patck kicks in looks like this: >> >> .... >> (org-export-html-close-lists-maybe line) >> >> ;; Protected HTML >> (when (get-text-property 0 'org-protected line) >> (let (par (ind (get-text-property 0 'original-indentation >> line))) >> (when (re-search-backward >> "\\(

\\)\\([ \t\r\n]*\\)\\=" (- (point) 100) t) >> (setq par (match-string 1)) >> (replace-match "\\2\n")) >> (insert line "\n") >> >> So before we are looking at protected stuff, there is already a >> call to >> org-export-html-close-lists-maybe. It seems to me that what you >> are trying to >> do >> could just happen inside that function. The function checks for a >> text property >> 'original-indentation to check for special stuff that was indented - >> but apparently that does not cover your case. So in that function >> you could >> also look at the protected property and act accordingly. >> >> Does that make sense? > > > > Ah, now I got you here! > > You're feeling for the code is all to good :) I could indeed remove > more > than half of the lines. > > > So here comes the next generation: > > > > diff --git a/lisp/org-html.el b/lisp/org-html.el > index 0903bff..5b13649 100644 > --- a/lisp/org-html.el > +++ b/lisp/org-html.el > @@ -959,10 +959,12 @@ lang=\"%s\" xml:lang=\"%s\"> > (when (equal "ORG-VERSE-START" line) > (org-close-par-maybe) > (insert "\n

\n") > + (setq org-par-open t) > (setq inverse t) > (throw 'nextline nil)) > (when (equal "ORG-VERSE-END" line) > (insert "

\n") > + (setq org-par-open nil) > (org-open-par) > (setq inverse nil) > (throw 'nextline nil)) > @@ -1996,7 +1998,11 @@ If there are links in the string, don't > modify these." > (defvar local-list-indent) > (defvar local-list-type) > (defun org-export-html-close-lists-maybe (line) > - (let ((ind (or (get-text-property 0 'original-indentation line))) > + (let* ((rawhtml (and in-local-list (get-text-property 0 'org- > protected line))) > + (ind > + (if rawhtml > + (org-get-indentation line) > + (or (get-text-property 0 'original-indentation line)))) > ; (and (string-match "\\S-" line) > ; (org-get-indentation line)))) > didclose) > > > > Sebastian > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten