Mercurial > emacs
view lisp/org/org-exp-blocks.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.
* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.
* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.
* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it. Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.
* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.
* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.
* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.
* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.
* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.
* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list. Add FLAGS
arguments. Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.
* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.
* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal. Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.
* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.
* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.
* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.
* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.
* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted. Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.
* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.
* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.
* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.
* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.
* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.
* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.
* semantic/db-file.el (semanticdb-save-db): Simplify msg.
* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.
* semantic/ctxt.el (semantic-ctxt-imported-packages): New.
* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.
* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.
* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.
* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor. When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.
* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | 1d1d5d9bd884 |
children | 594e81986a75 376148b31b5e |
line wrap: on
line source
;;; org-exp-blocks.el --- pre-process blocks when exporting org files ;; Copyright (C) 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: Eric Schulte ;; This file is part of GNU Emacs. ;; ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; ;; This is a utility for pre-processing blocks in org files before ;; export using the `org-export-preprocess-hook'. It can be used for ;; exporting new types of blocks from org-mode files and also for ;; changing the default export behavior of existing org-mode blocks. ;; The `org-export-blocks' and `org-export-interblocks' variables can ;; be used to control how blocks and the spaces between blocks ;; respectively are processed upon export. ;; ;; The type of a block is defined as the string following =#+begin_=, ;; so for example the following block would be of type ditaa. Note ;; that both upper or lower case are allowed in =#+BEGIN_= and ;; =#+END_=. ;; ;; #+begin_ditaa blue.png -r -S ;; +---------+ ;; | cBLU | ;; | | ;; | +----+ ;; | |cPNK| ;; | | | ;; +----+----+ ;; #+end_ditaa ;; ;;; Currently Implemented Block Types ;; ;; ditaa :: Convert ascii pictures to actual images using ditaa ;; http://ditaa.sourceforge.net/. To use this set ;; `org-ditaa-jar-path' to the path to ditaa.jar on your ;; system (should be set automatically in most cases) . ;; ;; dot :: Convert graphs defined using the dot graphing language to ;; images using the dot utility. For information on dot see ;; http://www.graphviz.org/ ;; ;; comment :: Wrap comments with titles and author information, in ;; their own divs with author-specific ids allowing for css ;; coloring of comments based on the author. ;; ;;; Adding new blocks ;; ;; When adding a new block type first define a formatting function ;; along the same lines as `org-export-blocks-format-dot' and then use ;; `org-export-blocks-add-block' to add your block type to ;; `org-export-blocks'. (eval-when-compile (require 'cl)) (require 'org) (defvar htmlp) (defvar latexp) (defvar docbookp) (defvar asciip) (defun org-export-blocks-set (var value) "Set the value of `org-export-blocks' and install fontification." (set var value) (mapc (lambda (spec) (if (nth 2 spec) (setq org-protecting-blocks (delete (symbol-name (car spec)) org-protecting-blocks)) (add-to-list 'org-protecting-blocks (symbol-name (car spec))))) value)) (defcustom org-export-blocks '((comment org-export-blocks-format-comment t) (ditaa org-export-blocks-format-ditaa nil) (dot org-export-blocks-format-dot nil)) "Use this a-list to associate block types with block exporting functions. The type of a block is determined by the text immediately following the '#+BEGIN_' portion of the block header. Each block export function should accept three argumets..." :group 'org-export-general :type '(repeat (list (symbol :tag "Block name") (function :tag "Block formatter") (boolean :tag "Fontify content as Org syntax"))) :set 'org-export-blocks-set) (defun org-export-blocks-add-block (block-spec) "Add a new block type to `org-export-blocks'. BLOCK-SPEC should be a three element list the first element of which should indicate the name of the block, the second element should be the formatting function called by `org-export-blocks-preprocess' and the third element a flag indicating whether these types of blocks should be fontified in org-mode buffers (see `org-protecting-blocks'). For example the BLOCK-SPEC for ditaa blocks is as follows... (ditaa org-export-blocks-format-ditaa nil)" (unless (member block-spec org-export-blocks) (setq org-export-blocks (cons block-spec org-export-blocks)) (org-export-blocks-set 'org-export-blocks org-export-blocks))) (defcustom org-export-interblocks '() "Use this a-list to associate block types with block exporting functions. The type of a block is determined by the text immediately following the '#+BEGIN_' portion of the block header. Each block export function should accept three argumets..." :group 'org-export-general :type 'alist) (defcustom org-export-blocks-witheld '(hidden) "List of block types (see `org-export-blocks') which should not be exported." :group 'org-export-general :type 'list) (defvar org-export-blocks-postblock-hooks nil "") (defun org-export-blocks-html-quote (body &optional open close) "Protext BODY from org html export. The optional OPEN and CLOSE tags will be inserted around BODY." (concat "\n#+BEGIN_HTML\n" (or open "") body (if (string-match "\n$" body) "" "\n") (or close "") "#+END_HTML\n")) (defun org-export-blocks-latex-quote (body &optional open close) "Protext BODY from org latex export. The optional OPEN and CLOSE tags will be inserted around BODY." (concat "\n#+BEGIN_LaTeX\n" (or open "") body (if (string-match "\n$" body) "" "\n") (or close "") "#+END_LaTeX\n")) (defun org-export-blocks-preprocess () "Export all blocks according to the `org-export-blocks' block exportation alist. Does not export block types specified in specified in BLOCKS which default to the value of `org-export-blocks-witheld'." (interactive) (save-window-excursion (let ((case-fold-search t) (types '()) indentation type func start body headers preserve-indent) (flet ((interblock (start end) (mapcar (lambda (pair) (funcall (second pair) start end)) org-export-interblocks))) (goto-char (point-min)) (setq start (point)) (while (re-search-forward "^\\([ \t]*\\)#\\+begin_\\(\\S-+\\)[ \t]*\\(.*\\)?[\r\n]\\([^\000]*?\\)[\r\n][ \t]*#\\+end_\\S-+.*" nil t) (setq indentation (length (match-string 1))) (setq type (intern (downcase (match-string 2)))) (setq headers (save-match-data (org-split-string (match-string 3) "[ \t]+"))) (setq body (match-string 4)) (setq preserve-indent (or org-src-preserve-indentation (member "-i" headers))) (unless preserve-indent (setq body (save-match-data (org-remove-indentation body)))) (unless (memq type types) (setq types (cons type types))) (save-match-data (interblock start (match-beginning 0))) (if (setq func (cadr (assoc type org-export-blocks))) (progn (replace-match (save-match-data (if (memq type org-export-blocks-witheld) "" (apply func body headers))) t t) (unless preserve-indent (indent-code-rigidly (match-beginning 0) (match-end 0) indentation)))) (setq start (match-end 0))) (interblock start (point-max)))))) (add-hook 'org-export-preprocess-hook 'org-export-blocks-preprocess) ;;================================================================================ ;; type specific functions ;;-------------------------------------------------------------------------------- ;; ditaa: create images from ASCII art using the ditaa utility (defvar org-ditaa-jar-path (expand-file-name "ditaa.jar" (file-name-as-directory (expand-file-name "scripts" (file-name-as-directory (expand-file-name "../contrib" (file-name-directory (or load-file-name buffer-file-name))))))) "Path to the ditaa jar executable") (defun org-export-blocks-format-ditaa (body &rest headers) "Pass block BODY to the ditaa utility creating an image. Specify the path at which the image should be saved as the first element of headers, any additional elements of headers will be passed to the ditaa utility as command line arguments." (message "ditaa-formatting...") (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers) " "))) (data-file (make-temp-file "org-ditaa")) (hash (sha1 (prin1-to-string (list body args)))) (raw-out-file (if headers (car headers))) (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\)$" raw-out-file) (cons (match-string 1 raw-out-file) (match-string 2 raw-out-file)) (cons raw-out-file "png"))) (out-file (concat (car out-file-parts) "_" hash "." (cdr out-file-parts)))) (unless (file-exists-p org-ditaa-jar-path) (error (format "Could not find ditaa.jar at %s" org-ditaa-jar-path))) (setq body (if (string-match "^\\([^:\\|:[^ ]\\)" body) body (mapconcat (lambda (x) (substring x (if (> (length x) 1) 2 1))) (org-split-string body "\n") "\n"))) (cond ((or htmlp latexp docbookp) (unless (file-exists-p out-file) (mapc ;; remove old hashed versions of this file (lambda (file) (when (and (string-match (concat (regexp-quote (car out-file-parts)) "_\\([[:alnum:]]+\\)\\." (regexp-quote (cdr out-file-parts))) file) (= (length (match-string 1 out-file)) 40)) (delete-file (expand-file-name file (file-name-directory out-file))))) (directory-files (or (file-name-directory out-file) default-directory))) (with-temp-file data-file (insert body)) (message (concat "java -jar " org-ditaa-jar-path " " args " " data-file " " out-file)) (shell-command (concat "java -jar " org-ditaa-jar-path " " args " " data-file " " out-file))) (format "\n[[file:%s]]\n" out-file)) (t (concat "\n#+BEGIN_EXAMPLE\n" body (if (string-match "\n$" body) "" "\n") "#+END_EXAMPLE\n"))))) ;;-------------------------------------------------------------------------------- ;; dot: create graphs using the dot graphing language ;; (require the dot executable to be in your path) (defun org-export-blocks-format-dot (body &rest headers) "Pass block BODY to the dot graphing utility creating an image. Specify the path at which the image should be saved as the first element of headers, any additional elements of headers will be passed to the dot utility as command line arguments. Don't forget to specify the output type for the dot command, so if you are exporting to a file with a name like 'image.png' you should include a '-Tpng' argument, and your block should look like the following. #+begin_dot models.png -Tpng digraph data_relationships { \"data_requirement\" [shape=Mrecord, label=\"{DataRequirement|description\lformat\l}\"] \"data_product\" [shape=Mrecord, label=\"{DataProduct|name\lversion\lpoc\lformat\l}\"] \"data_requirement\" -> \"data_product\" } #+end_dot" (message "dot-formatting...") (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers) " "))) (data-file (make-temp-file "org-ditaa")) (hash (sha1 (prin1-to-string (list body args)))) (raw-out-file (if headers (car headers))) (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\)$" raw-out-file) (cons (match-string 1 raw-out-file) (match-string 2 raw-out-file)) (cons raw-out-file "png"))) (out-file (concat (car out-file-parts) "_" hash "." (cdr out-file-parts)))) (cond ((or htmlp latexp docbookp) (unless (file-exists-p out-file) (mapc ;; remove old hashed versions of this file (lambda (file) (when (and (string-match (concat (regexp-quote (car out-file-parts)) "_\\([[:alnum:]]+\\)\\." (regexp-quote (cdr out-file-parts))) file) (= (length (match-string 1 out-file)) 40)) (delete-file (expand-file-name file (file-name-directory out-file))))) (directory-files (or (file-name-directory out-file) default-directory))) (with-temp-file data-file (insert body)) (message (concat "dot " data-file " " args " -o " out-file)) (shell-command (concat "dot " data-file " " args " -o " out-file))) (format "\n[[file:%s]]\n" out-file)) (t (concat "\n#+BEGIN_EXAMPLE\n" body (if (string-match "\n$" body) "" "\n") "#+END_EXAMPLE\n"))))) ;;-------------------------------------------------------------------------------- ;; comment: export comments in author-specific css-stylable divs (defun org-export-blocks-format-comment (body &rest headers) "Format comment BODY by OWNER and return it formatted for export. Currently, this only does something for HTML export, for all other backends, it converts the comment into an EXAMPLE segment." (let ((owner (if headers (car headers))) (title (if (cdr headers) (mapconcat 'identity (cdr headers) " ")))) (cond (htmlp ;; We are exporting to HTML (concat "#+BEGIN_HTML\n" "<div class=\"org-comment\"" (if owner (format " id=\"org-comment-%s\" " owner)) ">\n" (if owner (concat "<b>" owner "</b> ") "") (if (and title (> (length title) 0)) (concat " -- " title "</br>\n") "</br>\n") "<p>\n" "#+END_HTML\n" body "#+BEGIN_HTML\n" "</p>\n" "</div>\n" "#+END_HTML\n")) (t ;; This is not HTML, so just make it an example. (concat "#+BEGIN_EXAMPLE\n" (if title (concat "Title:" title "\n") "") (if owner (concat "By:" owner "\n") "") body (if (string-match "\n\\'" body) "" "\n") "#+END_EXAMPLE\n"))))) (provide 'org-exp-blocks) ;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024 ;;; org-exp-blocks.el ends here