Re: [patch] Terminating lists by indentation of #+SPECIALS too

From: Sebastian Rose <sebastian_rose@gmx.de>
To: Carsten Dominik <carsten.dominik@gmail.com>
Cc: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>
Subject: Re: [patch] Terminating lists by indentation of #+SPECIALS too
Date: Thu, 22 Apr 2010 11:09:31 +0200	[thread overview]
Message-ID: <87ochb26r8.fsf@gmx.de> (raw)
In-Reply-To: <398E37C4-42A0-4928-83BA-8F4258FE5503@gmail.com> (Carsten Dominik's message of "Thu, 22 Apr 2010 10:22:50 +0200")

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

Carsten Dominik <carsten.dominik@gmail.com> writes:
> Hi Sebastian,
>
> thanks or your patience - I have now aplied this patch.

Thanks!!!

> You are saying that your files "mostly validate".  Are there issues
> we should address?

No no no no no.

I checked it over and over again.... it's _not_ the exporter, but 
PHP's build-in XML-parser (libexpat ??).

It goes:

  Warning: DOMDocument::loadHTMLFile() [domdocument.loadhtmlfile]: ID
     org:1ad2d2aa-50d6-4423-9ada-ecb18b22fed7 already defined in
     ...

but it is not.

The parser fails to distinguish `name="org:2aff..."' and
`id="org:2aff..."' in headlines like

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-verbatim, Size: 74 bytes --]

<h4 id="sec-1"><a name="org:2aff..." id="org:2aff..."></a> Headline </h4>

[-- Attachment #3: Type: text/plain, Size: 3472 bytes --]

But it validates on http://validator.w3.org.

The other error is cut-and-pasted HTML. An embedded youtube video -
something about Org-mode :)

Those links do not validate - I'll have to fix that by hand.

  Sebastian

>
> Thanks!
>
> - Carsten
>
> On Apr 22, 2010, at 3:26 AM, Sebastian Rose wrote:
>
>> Carsten Dominik <carsten.dominik@gmail.com> 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
>>> 		     "\\(<p>\\)\\([ \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<p class=\"verse\">\n")
>> +        (setq org-par-open t)
>> 	    (setq inverse t)
>> 	    (throw 'nextline nil))
>> 	  (when (equal "ORG-VERSE-END" line)
>> 	    (insert "</p>\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
>
>
>

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Sebastian  Rose      Fachinformatiker / Anwendungsentwicklung
Viktoriastr. 22      Entwicklung von Anwendungen mit freien Werkzeugen
30451  Hannover      und Bibliotheken.

0173  83 93 417      sebastian_rose@gmx.de         s.rose@emma-stil.de
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[-- Attachment #4: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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