[-- Attachment #1: Type: text/plain, Size: 181 bytes --] A test file and the html output are attached. The "ugly" checkbox is ugly only because it is unlike anyother checkboxes. git commit at 66537. Behavious confirmed with emacs -Q. [-- Attachment #2: ugly-checkbox.org --] [-- Type: text/plain, Size: 507 bytes --] * Fun with Square Brackets Checkbox at item 13 is "ugly" in the exported HTML. 1. One 2. Two 3. Three[fn:1][fn:2] 10. [@10] Ten 11. Eleven 6. [@6] Six 7. [ ] Seven with Checkbox 8. [ ] Eight with Checkbox 13. [@13] [ ] Restart at thirteen [2/3] - [X] Peter - [X] Sarah - [-] Sam[fn:3][fn:4][1/3] - [ ] Alpha - [ ] Beta - [X] Gamma 14. Too much fun is injurious to health * Footnotes [fn:1] Footnote-1 [fn:2] Footnote-2 [fn:3] Footnote-3 [fn:4] Footnote-4 [-- Attachment #3: ugly-checkbox.html --] [-- Type: text/html, Size: 4817 bytes --] [-- Attachment #4: Type: text/plain, Size: 6 bytes --] --
[-- Attachment #1: Type: text/plain, Size: 235 bytes --] Jambunathan K <kjambunathan@gmail.com> writes: > A test file and the html output are attached. The "ugly" checkbox is > ugly only because it is unlike anyother checkboxes. This patch should do. Hope it doesn't break any other case. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0002-org-html.el-org-html-export-list-line-correct-the-ug.patch --] [-- Type: text/x-patch, Size: 875 bytes --] From a316c18009b878c3edd2ef241fd42ba25b91246a Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel.giraud@univ-nantes.fr> Date: Wed, 29 Jun 2011 16:57:03 +0200 Subject: [PATCH 2/2] * org-html.el (org-html-export-list-line): correct the ugly checkbox --- lisp/org-html.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 174ee4b..814b772 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2532,7 +2532,7 @@ the alist of previous items." (string-match (concat "[ \t]*\\(\\S-+[ \t]*\\)" "\\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\]\\)?" - "\\(?:\\(\\[[ X-]\\]\\)[ \t]+\\)?" + "[ \t]*\\(?:\\(\\[[ X-]\\]\\)[ \t]+\\)?" "\\(?:\\(.*\\)[ \t]+::\\(?:[ \t]+\\|$\\)\\)?" "\\(.*\\)") line) (let* ((checkbox (match-string 3 line)) -- 1.7.5 [-- Attachment #3: Type: text/plain, Size: 19 bytes --] -- Manuel Giraud
[-- Attachment #1: Type: text/plain, Size: 93 bytes --] Oops, the previous patch was applied on top on another one I have here. This one's better. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-org-html.el-org-html-export-list-line-correct-the-ug.patch --] [-- Type: text/x-patch, Size: 871 bytes --] From d9533465909a822275c01450cb00afa96ddcf1b6 Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel.giraud@univ-nantes.fr> Date: Wed, 29 Jun 2011 17:11:16 +0200 Subject: [PATCH] * org-html.el (org-html-export-list-line): correct the ugly checkbox --- lisp/org-html.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index a343647..db8b42b 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -2532,7 +2532,7 @@ the alist of previous items." (string-match (concat "[ \t]*\\(\\S-+[ \t]*\\)" "\\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\]\\)?" - "\\(?:\\(\\[[ X-]\\]\\)[ \t]+\\)?" + "[ \t]*\\(?:\\(\\[[ X-]\\]\\)[ \t]+\\)?" "\\(?:\\(.*\\)[ \t]+::\\(?:[ \t]+\\|$\\)\\)?" "\\(.*\\)") line) (let* ((checkbox (match-string 3 line)) -- 1.7.5 [-- Attachment #3: Type: text/plain, Size: 19 bytes --] -- Manuel Giraud
Hello,
Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
> Jambunathan K <kjambunathan@gmail.com> writes:
>
>> A test file and the html output are attached. The "ugly" checkbox is
>> ugly only because it is unlike anyother checkboxes.
>
> This patch should do. Hope it doesn't break any other case.
The "problem" is deeper than that. At the moment [@6] [ ] isn't
recognized as a valid check-box, while [@6][ ] is.
Proof: try to C-c C-c the ugly checkbox.
Anyhow, for now, when there is both a counter and a checkbox in the
item, you have to stick them. It will then export fine.
Regards,
--
Nicolas Goaziou
Hello,
Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
> Oops, the previous patch was applied on top on another one I have
> here. This one's better.
I've pushed a fix for that problem in git master. Spaces between
counters and check-boxes should now be supported.
Regards,
--
Nicolas Goaziou
Hi Manuel,
Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
> Oops, the previous patch was applied on top on another one I have
> here. This one's better.
I let Nicolas decide on this one.
--
Bastien
Bastien <bzg@altern.org> writes:
> Hi Manuel,
>
> Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
>
>> Oops, the previous patch was applied on top on another one I have
>> here. This one's better.
>
> I let Nicolas decide on this one.
Nicolas' patch is already applied and far more complete than mine. So I
guess it's decided ;-)
--
Manuel Giraud
Manuel Giraud <manuel.giraud@univ-nantes.fr> writes:
> Nicolas' patch is already applied and far more complete than mine. So
> I guess it's decided ;-)
Great -- thanks for the update!
--
Bastien