From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Valid xhtml and org-html.el Date: Mon, 4 May 2009 16:22:05 +0200 Message-ID: <1A0F6E2D-8028-4807-89A8-6523A3F1BAB6@gmail.com> References: <87skjldy4e.fsf@kassiopeya.MSHEIMNETZ> Mime-Version: 1.0 (Apple Message framework v930.3) 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 1M0z3d-0002p2-Vv for emacs-orgmode@gnu.org; Mon, 04 May 2009 10:22:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M0z3Z-0002kH-F6 for emacs-orgmode@gnu.org; Mon, 04 May 2009 10:22:13 -0400 Received: from [199.232.76.173] (port=33435 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M0z3Z-0002k6-1H for emacs-orgmode@gnu.org; Mon, 04 May 2009 10:22:09 -0400 Received: from mail-ew0-f162.google.com ([209.85.219.162]:55556) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M0z3X-0007VH-Uc for emacs-orgmode@gnu.org; Mon, 04 May 2009 10:22:08 -0400 Received: by ewy6 with SMTP id 6so4092406ewy.42 for ; Mon, 04 May 2009 07:22:07 -0700 (PDT) In-Reply-To: <87skjldy4e.fsf@kassiopeya.MSHEIMNETZ> 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, On May 4, 2009, at 11:18 AM, Sebastian Rose wrote: > Hi, > > > appended is a patch for org-html.el. > > > This is what it does: > > 1. is no valid XHTML. Coltags must be empty. I.e., > applied. > > 2. ... tags where missing applied > > 3. A minor fix for the end of the CSS comments. Safari doesn't like > /*]]>*///--> > and is right in this case. `//' does not start a comment in CSS. > Therefore, I changed it to > /*]]>*/--> > which is valid and Safari shuts up. You changed this only once, it it needed in two places, right? I changed it in both. > > 4. Change `&' in link descriptions to `&' again. > Not sure if I did it in the right place though, but I guess > `org-export-html-format-desc' is only called to format link > descriptions. I have not yet applied this, can you give me an example where this is needed? > > > Apropos validation: > > I worked a little on org-search.php this weekend. It now works > without > networking by default and is much faster. > > Also, you may now use it without a database, just to validate the > XHTML output. No installation required anymore. In that case, the > script just scanns the first 10 files (customizable) found and > displays the parser-errors. > > If you use the script with database, wrong links to images are > detected now. That's nice, when moving files around in your > org-directories. > > Get it here: > http://github.com/SebastianRose/org-search.php/tree/master I need to find time to check this out definitely. Thanks. - Carsten > > > > diff --git a/lisp/org-html.el b/lisp/org-html.el > index 5608b50..8e3ed4e 100644 > --- a/lisp/org-html.el > +++ b/lisp/org-html.el > @@ -123,7 +123,7 @@ not be modified." > white-space:nowrap; } > .org-info-js_search-highlight {background-color:#ffff00; > color:#000000; > font-weight:bold; } > - /*]]>*///--> > + /*]]>*/--> > " > "The default style specification for exported HTML files. > Please use the variables `org-export-html-style' and > @@ -1353,10 +1353,10 @@ lang=\"%s\" xml:lang=\"%s\"> > > (defun org-export-html-format-desc (s) > "Make sure the S is valid as a description in a link." > - (if (and s (not (get-text-property 1 'org-protected s))) > - (save-match-data > - (org-html-do-expand s)) > - s)) > + (save-match-data > + (if (and s (not (get-text-property 1 'org-protected s))) > + (org-html-do-expand s) > + (org-html-protect s)))) > > (defun org-export-html-format-image (src par-open) > "Create image tag with source and attributes." > @@ -1492,23 +1492,18 @@ lang=\"%s\" xml:lang=\"%s\"> > (setq html (nreverse html)) > (unless splice > ;; Put in col tags with the alignment (unfortunately often > ignored...) > - (push (mapconcat > - (lambda (x) > - (setq gr (pop org-table-colgroup-info)) > - (format "%s%s" > - (if (memq gr '(:start :startend)) > - (prog1 > - (if colgropen "\n" "") > - (setq colgropen t)) > - "") > + (push (concat > + "" > + (mapconcat > + (lambda (x) > + (setq gr (pop org-table-colgroup-info)) > + (format "" > (if (> (/ (float x) nlines) org-table-number-fraction) > - "right" "left") > - (if (memq gr '(:end :startend)) > - (progn (setq colgropen nil) "") > - ""))) > - fnum "") > + "right" "left"))) > + fnum "") > + "") > html) > - (if colgropen (setq html (cons (car html) (cons " colgroup>" (cdr html))))) > + > ;; Since the output of HTML table formatter can also be used in > ;; DocBook document, we want to always include the caption to > make > ;; DocBook XML file valid. > > > Regards > > Sebastian > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode