* [REGRESSION] org-html.el (targets) @ 2011-02-20 19:14 Jambunathan K 2011-03-07 16:15 ` Manuel Giraud 0 siblings, 1 reply; 13+ messages in thread From: Jambunathan K @ 2011-02-20 19:14 UTC (permalink / raw) To: emacs-orgmode [-- Attachment #1: Type: text/plain, Size: 426 bytes --] I am attaching the bug.org file and the html exports as done by git versions 048f32 (approx a month old) and 77c278 (very recent). Put the html file in nxml-mode and do a C-c C-n to check for validation errors. Click on the associated links in the html browser and you would notice that there is a regression. I don't haven't tried git bisection. I hope someone fixes these regressions & malformed htmls. Jambunathan K. [-- Attachment #2: bug.org --] [-- Type: text/plain, Size: 3636 bytes --] #+TITLE: Testfile for OpenDocumentText Exporter #+AUTHOR: Jambunathan K #+EMAIL: kjambunathan@gmail.com #+DATE: 2010-10-26 Sat #+LANGUAGE: en #+OPTIONS: H:3 num:t \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t #+OPTIONS: LaTeX:dvipng #+STARTUP: inlineimages showall * Links ** Targets *** Fuzzy Target *** Target with CUSTOMID :PROPERTIES: :CUSTOM_ID: aabbccddeeff :END: *** Dedicated Target Style1 # <<Dedicated Target>> *** Dedicated Target Style2 There is a dedicated target at the end of this sentence - <<Dedicated Target1>>. *** <<<Radioed Target>>> ** References *** References to Fuzzy Target This is a link to [[Fuzzy Target]]. *** References to CUSTOMID links This is a link to [[#aabbccddeeff][Target with CUSTOMID]]. This is nodesc link to [[#aabbccddeeff]]. *** References to Dedicated Target There is a link to nodesc [[Dedicated Target]] here. There is a link to [[Dedicated%20Target][Jump to Dedicated Target]] here. There is a link to [[Dedicated%20Target1][Dedicated Target1]] here. *** References to Radioed Links This section has references to Radioed Target. One more reference to Radioed Target. * Tables ** A simple Orgmode Table | EST | New York | -5:00 | | IST | Madras | +5:30 | | AST | Bahrain | +3:00 | ** A formatted Orgmode Table #+CAPTION: An Example Table #+LABEL: table:10 | Labels | Column1 | Column2 | Column3 | |--------------------+------------+-----------------------+------------------| | / | < | > | <> | | <r> | <l> | <c> | <r> | | Row1Row1Row1 Right | R1C1 Left | R1C2R1C2R1C2 Centered | R1C3 Right | |--------------------+------------+-----------------------+------------------| | Row2Row2 | R2C1R2C1 | R2C2R2C2 | R2C3R2C3R2C3R2C3 | | | | | | |--------------------+------------+-----------------------+------------------| ** Table.el Table with no Spanning +---------------+---------------+ |Term |Percentage | +---------------+---------------+ |Quarter |25% | |One-Fourth | | +---------------+---------------+ |Half |50% | |One-by-Two | | +---------------+---------------+ |Three-Quarters |75% | |Three-Fourths | | +---------------+---------------+ |Full |100% | |Whole | | +---------------+---------------+ ** COMMENT Table.el Table with Spanning +----------+---------------------+----------+ |Name |cmd calls |Percentage| +----------+ +----------+ |rgb |93 534 |46% | +----------+ +----------+ |Xah |82 090 |40% | +----------+ +----------+ |total |203 118 |100% | +----------+---------------------+----------+ ** COMMENT Another Table.el Table with Spanning +----------+----------+ | Header 1 | Header 2 | +----------+----------+ | R1 C1-2 | +----------+----------+ | R2 C1 | R2-3 C2 | + +----------+ | | | +----------+----------+ * Table Referenced Please refer to \ref{table:10} for further information. [-- Attachment #3: bug-048f32.html --] [-- Type: text/html, Size: 9773 bytes --] [-- Attachment #4: bug-77c278.html --] [-- Type: text/html, Size: 9936 bytes --] [-- Attachment #5: 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [REGRESSION] org-html.el (targets) 2011-02-20 19:14 [REGRESSION] org-html.el (targets) Jambunathan K @ 2011-03-07 16:15 ` Manuel Giraud 2011-03-07 20:37 ` Bernt Hansen 0 siblings, 1 reply; 13+ messages in thread From: Manuel Giraud @ 2011-03-07 16:15 UTC (permalink / raw) To: emacs-orgmode [-- Attachment #1: Type: text/plain, Size: 228 bytes --] Jambunathan K <kjambunathan@gmail.com> writes: > I am attaching the bug.org file and the html exports as done by git > versions 048f32 (approx a month old) and 77c278 (very recent). Hi, Here's a patch that fixes this issue. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-org-html.el-bug-that-prevents-some-target-to-be-rend.patch --] [-- Type: text/x-patch, Size: 1548 bytes --] From cd423f908de55a2379c4476c0da8922968786e64 Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel.giraud@univ-nantes.fr> Date: Mon, 7 Mar 2011 17:12:46 +0100 Subject: [PATCH] org-html.el: bug that prevents some target to be rendered correctly. --- lisp/org-exp.el | 2 +- lisp/org-html.el | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index ae7bdcf..f22eeba 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2062,7 +2062,7 @@ can work correctly." (let* ((rtn (mapconcat 'identity - (org-split-string s "[^a-zA-Z0-9_\\.-]+") "--")) + (org-split-string s "[^a-zA-Z0-9_\\.-]+") "-")) (a (assoc rtn alist))) (or (cdr a) rtn)))) diff --git a/lisp/org-html.el b/lisp/org-html.el index eb4b199..8fe8029 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2181,12 +2181,12 @@ that uses these same face definitions." (defun org-html-protect (s) "Convert characters to HTML equivalent. Possible conversions are set in `org-export-html-protect-char-alist'." - (let ((start 0) - (cl org-export-html-protect-char-alist) c) + (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) - (while (string-match (car c) s start) - (setq s (replace-match (cdr c) t t s) - start (1+ (match-beginning 0))))) + (let ((start 0)) + (while (string-match (car c) s start) + (setq s (replace-match (cdr c) t t s) + start (match-beginning 0))))) s)) (defun org-html-expand (string) -- 1.7.1 [-- Attachment #3: Type: text/plain, Size: 33 bytes --] Best regards, -- Manuel Giraud ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-07 16:15 ` Manuel Giraud @ 2011-03-07 20:37 ` Bernt Hansen 2011-03-08 7:14 ` Aankhen 0 siblings, 1 reply; 13+ messages in thread From: Bernt Hansen @ 2011-03-07 20:37 UTC (permalink / raw) To: Manuel Giraud; +Cc: emacs-orgmode Manuel Giraud <manuel.giraud@univ-nantes.fr> writes: > Jambunathan K <kjambunathan@gmail.com> writes: > >> I am attaching the bug.org file and the html exports as done by git >> versions 048f32 (approx a month old) and 77c278 (very recent). > > Hi, > > Here's a patch that fixes this issue. Hi Manuel, Thanks for the patch. I still see validation errors after applying this patch. I've posted the original test file at http://www.norang.ca/tmp/foo.html and you can click on the validation link at the bottom to see the remaining errors. Regards, -- Bernt ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-07 20:37 ` Bernt Hansen @ 2011-03-08 7:14 ` Aankhen 2011-03-08 10:15 ` Manuel Giraud 2011-03-09 10:36 ` Bastien 0 siblings, 2 replies; 13+ messages in thread From: Aankhen @ 2011-03-08 7:14 UTC (permalink / raw) To: Bernt Hansen, Manuel Giraud, Org-mode ml On Tue, Mar 8, 2011 at 02:07, Bernt Hansen <bernt@norang.ca> wrote: > Thanks for the patch. I still see validation errors after applying this > patch. I've posted the original test file at > http://www.norang.ca/tmp/foo.html and you can click on the validation > link at the bottom to see the remaining errors. This one seemed easy to fix, so I thought I’d butt in. :-) Hope the format of the patch is right (I’m using hg-git). --8<---------------cut here---------------start------------->8--- # HG changeset patch # User Aankhen # Date 1299568135 -19800 # Node ID 23e761c8a103c521aef0a85ee3650bc850d0193d # Parent 56fa585a0f995bc97006ce6d6c2baab9c484444c Fix anchors in HTML export. diff --git a/lisp/org-html.el b/lisp/org-html.el --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1996,8 +1996,8 @@ ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format "<caption>%s</caption>" (or caption "")) html) - (when label (push (format "<a name=\"%s\" id=\"%s\"></a>" (org-solidify-link-text label) (org-solidify-link-text label)) - html)) + (when label + (setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label))))) (push html-table-tag html)) (setq html (mapcar (lambda (x) --8<---------------cut here---------------end--------------->8--- Aankhen ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-08 7:14 ` Aankhen @ 2011-03-08 10:15 ` Manuel Giraud 2011-03-08 15:02 ` Bernt Hansen 2011-03-09 10:39 ` Bastien 2011-03-09 10:36 ` Bastien 1 sibling, 2 replies; 13+ messages in thread From: Manuel Giraud @ 2011-03-08 10:15 UTC (permalink / raw) To: Aankhen; +Cc: Bernt Hansen, Org-mode ml [-- Attachment #1: Type: text/plain, Size: 640 bytes --] Aankhen <aankhen@gmail.com> writes: > On Tue, Mar 8, 2011 at 02:07, Bernt Hansen <bernt@norang.ca> wrote: >> Thanks for the patch. I still see validation errors after applying this >> patch. I've posted the original test file at >> http://www.norang.ca/tmp/foo.html and you can click on the validation >> link at the bottom to see the remaining errors. > > This one seemed easy to fix, so I thought I’d butt in. :-) Hope the > format of the patch is right (I’m using hg-git). Thanks. Modulo line breakage this patch applies and Jambunathan's test file now validates XHTML 1.0 Here's the 2 patch that solve this: [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-org-html.el-bug-that-prevents-some-target-to-be-rend.patch --] [-- Type: text/x-patch, Size: 1552 bytes --] From cd423f908de55a2379c4476c0da8922968786e64 Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel.giraud@univ-nantes.fr> Date: Mon, 7 Mar 2011 17:12:46 +0100 Subject: [PATCH 1/2] org-html.el: bug that prevents some target to be rendered correctly. --- lisp/org-exp.el | 2 +- lisp/org-html.el | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index ae7bdcf..f22eeba 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2062,7 +2062,7 @@ can work correctly." (let* ((rtn (mapconcat 'identity - (org-split-string s "[^a-zA-Z0-9_\\.-]+") "--")) + (org-split-string s "[^a-zA-Z0-9_\\.-]+") "-")) (a (assoc rtn alist))) (or (cdr a) rtn)))) diff --git a/lisp/org-html.el b/lisp/org-html.el index eb4b199..8fe8029 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2181,12 +2181,12 @@ that uses these same face definitions." (defun org-html-protect (s) "Convert characters to HTML equivalent. Possible conversions are set in `org-export-html-protect-char-alist'." - (let ((start 0) - (cl org-export-html-protect-char-alist) c) + (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) - (while (string-match (car c) s start) - (setq s (replace-match (cdr c) t t s) - start (1+ (match-beginning 0))))) + (let ((start 0)) + (while (string-match (car c) s start) + (setq s (replace-match (cdr c) t t s) + start (match-beginning 0))))) s)) (defun org-html-expand (string) -- 1.7.1 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-Fix-anchors-in-HTML-export.patch --] [-- Type: text/x-patch, Size: 1033 bytes --] From 3842d9aa15271658b06ad818761d530c871492e0 Mon Sep 17 00:00:00 2001 From: Aankhen <aankhen@gmail.com> Date: Tue, 8 Mar 2011 11:06:44 +0100 Subject: [PATCH 2/2] Fix anchors in HTML export. --- lisp/org-html.el | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 8fe8029..9b44e8a 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1996,8 +1996,8 @@ for formatting. This is required for the DocBook exporter." ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format "<caption>%s</caption>" (or caption "")) html) - (when label (push (format "<a name=\"%s\" id=\"%s\"></a>" (org-solidify-link-text label) (org-solidify-link-text label)) - html)) + (when label + (setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label))))) (push html-table-tag html)) (setq html (mapcar (lambda (x) -- 1.7.1 [-- Attachment #4: Type: text/plain, Size: 19 bytes --] -- Manuel Giraud ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-08 10:15 ` Manuel Giraud @ 2011-03-08 15:02 ` Bernt Hansen 2011-03-09 10:39 ` Bastien 1 sibling, 0 replies; 13+ messages in thread From: Bernt Hansen @ 2011-03-08 15:02 UTC (permalink / raw) To: Manuel Giraud; +Cc: Bastien, Aankhen, Org-mode ml Manuel Giraud <manuel.giraud@univ-nantes.fr> writes: > Aankhen <aankhen@gmail.com> writes: > >> On Tue, Mar 8, 2011 at 02:07, Bernt Hansen <bernt@norang.ca> wrote: >>> Thanks for the patch. I still see validation errors after applying this >>> patch. I've posted the original test file at >>> http://www.norang.ca/tmp/foo.html and you can click on the validation >>> link at the bottom to see the remaining errors. >> >> This one seemed easy to fix, so I thought I’d butt in. :-) Hope the >> format of the patch is right (I’m using hg-git). > > Thanks. Modulo line breakage this patch applies and Jambunathan's test > file now validates XHTML 1.0 > > Here's the 2 patch that solve this: These patches make nxhtml mode report that the result is now valid. Thanks! Regards, -- Bernt ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-08 10:15 ` Manuel Giraud 2011-03-08 15:02 ` Bernt Hansen @ 2011-03-09 10:39 ` Bastien 2011-03-09 10:40 ` Bastien 1 sibling, 1 reply; 13+ messages in thread From: Bastien @ 2011-03-09 10:39 UTC (permalink / raw) To: Manuel Giraud; +Cc: Bernt Hansen, Aankhen, Org-mode ml Hi Manuel, Manuel Giraud <manuel.giraud@univ-nantes.fr> writes: > Thanks. Modulo line breakage this patch applies and Jambunathan's test > file now validates XHTML 1.0 > > Here's the 2 patch that solve this: Thanks for the patches -- patchwork can only catch *one* patch per mail. I guess that's because people are encouraged to use git send-mail when they have several patches... May I ask you to rewrite these patches into a single one? Also, having a ChangeLog entry will help a lot. Thanks! -- Bastien ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-09 10:39 ` Bastien @ 2011-03-09 10:40 ` Bastien 2011-03-09 15:06 ` Manuel Giraud 0 siblings, 1 reply; 13+ messages in thread From: Bastien @ 2011-03-09 10:40 UTC (permalink / raw) To: Manuel Giraud; +Cc: Bernt Hansen, Aankhen, Org-mode ml Bastien <bzg@gnu.org> writes: > May I ask you to rewrite these patches into a single one? PS: I mean: merge all patches in this thread relevant to the problem, possibly including Aankhen patch. Thanks! -- Bastien ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-09 10:40 ` Bastien @ 2011-03-09 15:06 ` Manuel Giraud 2011-03-09 15:38 ` [Accepted] [O] " Bastien Guerry 2011-03-09 15:40 ` Bastien 0 siblings, 2 replies; 13+ messages in thread From: Manuel Giraud @ 2011-03-09 15:06 UTC (permalink / raw) To: Bastien; +Cc: Bernt Hansen, Aankhen, Org-mode ml [-- Attachment #1: Type: text/plain, Size: 287 bytes --] Bastien <bzg@altern.org> writes: > Bastien <bzg@gnu.org> writes: > >> May I ask you to rewrite these patches into a single one? > > PS: I mean: merge all patches in this thread relevant to the problem, > possibly including Aankhen patch. Thanks! Ok, here it is. Hopes this one's ok. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-Correct-HTML-export-of-dedicated-target.patch --] [-- Type: text/x-patch, Size: 2445 bytes --] From a9e692243b37be9947db9a7220ea561d261deaba Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel.giraud@univ-nantes.fr> Date: Wed, 9 Mar 2011 16:03:43 +0100 Subject: [PATCH] Correct HTML export of dedicated target. * org-html.el (org-format-org-table-html): fix anchors in HTML export (thanks to <aankhen@gmail.com>) (org-html-protect): fix a bug that prevents some target to be rendered correctly. * org-exp.el (org-solidify-link-text): a single "-" to avoid a "&ndash" rewrite in HTML export later. --- lisp/org-exp.el | 2 +- lisp/org-html.el | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 709317a..dff86b6 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2062,7 +2062,7 @@ can work correctly." (let* ((rtn (mapconcat 'identity - (org-split-string s "[^a-zA-Z0-9_\\.-]+") "--")) + (org-split-string s "[^a-zA-Z0-9_\\.-]+") "-")) (a (assoc rtn alist))) (or (cdr a) rtn)))) diff --git a/lisp/org-html.el b/lisp/org-html.el index 333cf4d..54cbf36 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1996,8 +1996,8 @@ for formatting. This is required for the DocBook exporter." ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format "<caption>%s</caption>" (or caption "")) html) - (when label (push (format "<a name=\"%s\" id=\"%s\"></a>" (org-solidify-link-text label) (org-solidify-link-text label)) - html)) + (when label + (setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label))))) (push html-table-tag html)) (setq html (mapcar (lambda (x) @@ -2181,12 +2181,12 @@ that uses these same face definitions." (defun org-html-protect (s) "Convert characters to HTML equivalent. Possible conversions are set in `org-export-html-protect-char-alist'." - (let ((start 0) - (cl org-export-html-protect-char-alist) c) + (let ((cl org-export-html-protect-char-alist) c) (while (setq c (pop cl)) - (while (string-match (car c) s start) - (setq s (replace-match (cdr c) t t s) - start (1+ (match-beginning 0))))) + (let ((start 0)) + (while (string-match (car c) s start) + (setq s (replace-match (cdr c) t t s) + start (match-beginning 0))))) s)) (defun org-html-expand (string) -- 1.7.1 [-- Attachment #3: Type: text/plain, Size: 19 bytes --] -- Manuel Giraud ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Accepted] [O] Re: [REGRESSION] org-html.el (targets) 2011-03-09 15:06 ` Manuel Giraud @ 2011-03-09 15:38 ` Bastien Guerry 2011-03-09 15:40 ` Bastien 1 sibling, 0 replies; 13+ messages in thread From: Bastien Guerry @ 2011-03-09 15:38 UTC (permalink / raw) To: emacs-orgmode Patch 664 (http://patchwork.newartisans.com/patch/664/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C87fwqwnxj6.fsf%40univ-nantes.fr%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [O] Re: [REGRESSION] org-html.el (targets) > Date: Wed, 09 Mar 2011 20:06:37 -0000 > From: Manuel Giraud <manuel.giraud@univ-nantes.fr> > X-Patchwork-Id: 664 > Message-Id: <87fwqwnxj6.fsf@univ-nantes.fr> > To: Bastien <bzg@altern.org> > Cc: Bernt Hansen <bernt@norang.ca>, Aankhen <aankhen@gmail.com>, > Org-mode ml <emacs-orgmode@gnu.org> > > Bastien <bzg@altern.org> writes: > > > Bastien <bzg@gnu.org> writes: > > > >> May I ask you to rewrite these patches into a single one? > > > > PS: I mean: merge all patches in this thread relevant to the problem, > > possibly including Aankhen patch. Thanks! > > Ok, here it is. Hopes this one's ok. > > > >From a9e692243b37be9947db9a7220ea561d261deaba Mon Sep 17 00:00:00 2001 > From: Manuel Giraud <manuel.giraud@univ-nantes.fr> > Date: Wed, 9 Mar 2011 16:03:43 +0100 > Subject: [PATCH] Correct HTML export of dedicated target. > > * org-html.el (org-format-org-table-html): fix anchors in HTML > export (thanks to <aankhen@gmail.com>) > (org-html-protect): fix a bug that prevents some target to be > rendered correctly. > > * org-exp.el (org-solidify-link-text): a single "-" to avoid a > "&ndash" rewrite in HTML export later. > --- > lisp/org-exp.el | 2 +- > lisp/org-html.el | 14 +++++++------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/lisp/org-exp.el b/lisp/org-exp.el > index 709317a..dff86b6 100644 > --- a/lisp/org-exp.el > +++ b/lisp/org-exp.el > @@ -2062,7 +2062,7 @@ can work correctly." > (let* ((rtn > (mapconcat > 'identity > - (org-split-string s "[^a-zA-Z0-9_\\.-]+") "--")) > + (org-split-string s "[^a-zA-Z0-9_\\.-]+") "-")) > (a (assoc rtn alist))) > (or (cdr a) rtn)))) > > diff --git a/lisp/org-html.el b/lisp/org-html.el > index 333cf4d..54cbf36 100644 > --- a/lisp/org-html.el > +++ b/lisp/org-html.el > @@ -1996,8 +1996,8 @@ for formatting. This is required for the DocBook exporter." > ;; DocBook document, we want to always include the caption to make > ;; DocBook XML file valid. > (push (format "<caption>%s</caption>" (or caption "")) html) > - (when label (push (format "<a name=\"%s\" id=\"%s\"></a>" (org-solidify-link-text label) (org-solidify-link-text label)) > - html)) > + (when label > + (setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label))))) > (push html-table-tag html)) > (setq html (mapcar > (lambda (x) > @@ -2181,12 +2181,12 @@ that uses these same face definitions." > (defun org-html-protect (s) > "Convert characters to HTML equivalent. > Possible conversions are set in `org-export-html-protect-char-alist'." > - (let ((start 0) > - (cl org-export-html-protect-char-alist) c) > + (let ((cl org-export-html-protect-char-alist) c) > (while (setq c (pop cl)) > - (while (string-match (car c) s start) > - (setq s (replace-match (cdr c) t t s) > - start (1+ (match-beginning 0))))) > + (let ((start 0)) > + (while (string-match (car c) s start) > + (setq s (replace-match (cdr c) t t s) > + start (match-beginning 0))))) > s)) > > (defun org-html-expand (string) > -- > 1.7.1 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-09 15:06 ` Manuel Giraud 2011-03-09 15:38 ` [Accepted] [O] " Bastien Guerry @ 2011-03-09 15:40 ` Bastien 1 sibling, 0 replies; 13+ messages in thread From: Bastien @ 2011-03-09 15:40 UTC (permalink / raw) To: Manuel Giraud; +Cc: Bernt Hansen, Aankhen, Org-mode ml Hi Manuel, Manuel Giraud <manuel.giraud@univ-nantes.fr> writes: > Bastien <bzg@altern.org> writes: > >> Bastien <bzg@gnu.org> writes: >> >>> May I ask you to rewrite these patches into a single one? >> >> PS: I mean: merge all patches in this thread relevant to the problem, >> possibly including Aankhen patch. Thanks! > > Ok, here it is. Hopes this one's ok. It is! Thanks a lot :) Next step is to use git send-mail :) -- Bastien ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-08 7:14 ` Aankhen 2011-03-08 10:15 ` Manuel Giraud @ 2011-03-09 10:36 ` Bastien 2011-03-09 19:27 ` Aankhen 1 sibling, 1 reply; 13+ messages in thread From: Bastien @ 2011-03-09 10:36 UTC (permalink / raw) To: Aankhen; +Cc: Bernt Hansen, Org-mode ml, Manuel Giraud Hi Aankhen, Aankhen <aankhen@gmail.com> writes: > This one seemed easy to fix, so I thought I’d butt in. :-) Hope the > format of the patch is right (I’m using hg-git). The patch was caught by patchwork, but wrongly wrapped. Thanks for it anyway! -- Bastien ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Re: [REGRESSION] org-html.el (targets) 2011-03-09 10:36 ` Bastien @ 2011-03-09 19:27 ` Aankhen 0 siblings, 0 replies; 13+ messages in thread From: Aankhen @ 2011-03-09 19:27 UTC (permalink / raw) To: Bastien, Bernt Hansen, Manuel Giraud, Org-mode ml Hi Bastien, On Wed, Mar 9, 2011 at 16:06, Bastien <bzg@altern.org> wrote: > Aankhen <aankhen@gmail.com> writes: > >> This one seemed easy to fix, so I thought I’d butt in. :-) Hope the >> format of the patch is right (I’m using hg-git). > > The patch was caught by patchwork, but wrongly wrapped. > > Thanks for it anyway! Glad I could help. :-) I guess I messed up the line endings, going by what Manuel and you said. Not sure how that happened. I’ll see if I can figure out how to prevent it in future. Aankhen ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-03-09 19:30 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-20 19:14 [REGRESSION] org-html.el (targets) Jambunathan K 2011-03-07 16:15 ` Manuel Giraud 2011-03-07 20:37 ` Bernt Hansen 2011-03-08 7:14 ` Aankhen 2011-03-08 10:15 ` Manuel Giraud 2011-03-08 15:02 ` Bernt Hansen 2011-03-09 10:39 ` Bastien 2011-03-09 10:40 ` Bastien 2011-03-09 15:06 ` Manuel Giraud 2011-03-09 15:38 ` [Accepted] [O] " Bastien Guerry 2011-03-09 15:40 ` Bastien 2011-03-09 10:36 ` Bastien 2011-03-09 19:27 ` Aankhen
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).