* [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers
@ 2009-04-19 16:29 Bernt Hansen
2009-04-19 16:29 ` [PATCH] Fix section id on HTML export when no custom id is present Bernt Hansen
2009-04-19 20:33 ` [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Carsten Dominik
0 siblings, 2 replies; 5+ messages in thread
From: Bernt Hansen @ 2009-04-19 16:29 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
The wrong name was added for CUSTOM_ID in the completion list for
properties in commit 931e13d (Custom IDs: Documentation and
improvements)
---
This patch is available at git://git.norang.ca/org-mode for-carsten
lisp/org.el | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 3c95baa..41e0e48 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11148,7 +11148,7 @@ These are properties that are not defined in the property drawer,
but in some other way.")
(defconst org-default-properties
- '("ARCHIVE" "CATEGORY" "SUMMARY" "DESCRIPTION" "CUSTOM_LINK"
+ '("ARCHIVE" "CATEGORY" "SUMMARY" "DESCRIPTION" "CUSTOM_ID"
"LOCATION" "LOGGING" "COLUMNS" "VISIBILITY"
"TABLE_EXPORT_FORMAT" "TABLE_EXPORT_FILE"
"EXPORT_FILE_NAME" "EXPORT_TITLE" "EXPORT_AUTHOR" "EXPORT_DATE"
--
1.6.3.rc1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] Fix section id on HTML export when no custom id is present
2009-04-19 16:29 [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Bernt Hansen
@ 2009-04-19 16:29 ` Bernt Hansen
2009-04-19 20:33 ` Carsten Dominik
2009-04-19 20:33 ` [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Carsten Dominik
1 sibling, 1 reply; 5+ messages in thread
From: Bernt Hansen @ 2009-04-19 16:29 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
This fixes a bug where section ids were all set to 'nil'.
suffix and href were identical so suffix is no more.
Before this change the table of contents had the correct id but the
heading levels all had id="nil"
---
This patch is available at git://git.norang.ca/org-mode for-carsten
lisp/org-html.el | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 0f3d113..0c416af 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1817,7 +1817,7 @@ When TITLE is nil, just close all open levels."
(preferred (cdr (assoc target org-export-preferred-target-alist)))
(remove (or preferred target))
(l org-level-max)
- snumber href suffix)
+ snumber href)
(setq extra-targets (remove remove extra-targets))
(setq extra-targets
(mapconcat (lambda (x)
@@ -1874,12 +1874,11 @@ When TITLE is nil, just close all open levels."
level snumber)
" " title)))
(unless (= head-count 1) (insert "\n</div>\n"))
- (setq href (cdr (assoc (concat "sec-" snumber) org-export-preferred-target-alist)))
- (setq suffix (or href (concat "sec-" snumber)))
+ (setq href (or (cdr (assoc (concat "sec-" snumber) org-export-preferred-target-alist)) (concat "sec-" snumber)))
(insert (format "\n<div id=\"outline-container-%s\" class=\"outline-%d\">\n<h%d id=\"%s\">%s%s</h%d>\n<div class=\"outline-text-%d\" id=\"text-%s\">\n"
- suffix level level href
+ href level level href
extra-targets
- title level level suffix))
+ title level level href))
(org-open-par)))))
(defun org-export-html-get-tag-class-name (tag)
--
1.6.3.rc1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fix section id on HTML export when no custom id is present
2009-04-19 16:29 ` [PATCH] Fix section id on HTML export when no custom id is present Bernt Hansen
@ 2009-04-19 20:33 ` Carsten Dominik
2009-04-20 2:16 ` Bernt Hansen
0 siblings, 1 reply; 5+ messages in thread
From: Carsten Dominik @ 2009-04-19 20:33 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
Yes, a bug, but your fix is not the right one, see the discussions
with Sebastian about the naming of containers and IDs.
Fixed, in a different way.
Thanks.
- Carsten
On Apr 19, 2009, at 6:29 PM, Bernt Hansen wrote:
> This fixes a bug where section ids were all set to 'nil'.
> suffix and href were identical so suffix is no more.
>
> Before this change the table of contents had the correct id but the
> heading levels all had id="nil"
> ---
>
> This patch is available at git://git.norang.ca/org-mode for-carsten
>
> lisp/org-html.el | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/lisp/org-html.el b/lisp/org-html.el
> index 0f3d113..0c416af 100644
> --- a/lisp/org-html.el
> +++ b/lisp/org-html.el
> @@ -1817,7 +1817,7 @@ When TITLE is nil, just close all open levels."
> (preferred (cdr (assoc target org-export-preferred-target-alist)))
> (remove (or preferred target))
> (l org-level-max)
> - snumber href suffix)
> + snumber href)
> (setq extra-targets (remove remove extra-targets))
> (setq extra-targets
> (mapconcat (lambda (x)
> @@ -1874,12 +1874,11 @@ When TITLE is nil, just close all open
> levels."
> level snumber)
> " " title)))
> (unless (= head-count 1) (insert "\n</div>\n"))
> - (setq href (cdr (assoc (concat "sec-" snumber) org-export-
> preferred-target-alist)))
> - (setq suffix (or href (concat "sec-" snumber)))
> + (setq href (or (cdr (assoc (concat "sec-" snumber) org-export-
> preferred-target-alist)) (concat "sec-" snumber)))
> (insert (format "\n<div id=\"outline-container-%s\" class=\"outline-
> %d\">\n<h%d id=\"%s\">%s%s</h%d>\n<div class=\"outline-text-%d\" id=
> \"text-%s\">\n"
> - suffix level level href
> + href level level href
> extra-targets
> - title level level suffix))
> + title level level href))
> (org-open-par)))))
>
> (defun org-export-html-get-tag-class-name (tag)
> --
> 1.6.3.rc1
>
>
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers
2009-04-19 16:29 [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Bernt Hansen
2009-04-19 16:29 ` [PATCH] Fix section id on HTML export when no custom id is present Bernt Hansen
@ 2009-04-19 20:33 ` Carsten Dominik
1 sibling, 0 replies; 5+ messages in thread
From: Carsten Dominik @ 2009-04-19 20:33 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
Applied, thanks.
- Carsten
On Apr 19, 2009, at 6:29 PM, Bernt Hansen wrote:
> The wrong name was added for CUSTOM_ID in the completion list for
> properties in commit 931e13d (Custom IDs: Documentation and
> improvements)
> ---
>
> This patch is available at git://git.norang.ca/org-mode for-carsten
>
> lisp/org.el | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/org.el b/lisp/org.el
> index 3c95baa..41e0e48 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -11148,7 +11148,7 @@ These are properties that are not defined in
> the property drawer,
> but in some other way.")
>
> (defconst org-default-properties
> - '("ARCHIVE" "CATEGORY" "SUMMARY" "DESCRIPTION" "CUSTOM_LINK"
> + '("ARCHIVE" "CATEGORY" "SUMMARY" "DESCRIPTION" "CUSTOM_ID"
> "LOCATION" "LOGGING" "COLUMNS" "VISIBILITY"
> "TABLE_EXPORT_FORMAT" "TABLE_EXPORT_FILE"
> "EXPORT_FILE_NAME" "EXPORT_TITLE" "EXPORT_AUTHOR" "EXPORT_DATE"
> --
> 1.6.3.rc1
>
>
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-04-20 2:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-19 16:29 [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Bernt Hansen
2009-04-19 16:29 ` [PATCH] Fix section id on HTML export when no custom id is present Bernt Hansen
2009-04-19 20:33 ` Carsten Dominik
2009-04-20 2:16 ` Bernt Hansen
2009-04-19 20:33 ` [PATCH] Fix CUSTOM_ID completion for PROPERTY drawers Carsten Dominik
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).