2016-09-28 17:08:12 +00:00
|
|
|
;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks -*- lexical-binding: t -*-
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
;; Copyright (C) 2002-2003, 2009-2019 Free Software Foundation, Inc.
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; Emacs Lisp Archive Entry
|
2013-10-30 16:21:41 +00:00
|
|
|
;; Package: htmlfontify
|
2009-11-19 20:21:01 +00:00
|
|
|
;; Filename: htmlfontify.el
|
|
|
|
;; Version: 0.21
|
|
|
|
;; Keywords: html, hypermedia, markup, etags
|
|
|
|
;; Author: Vivek Dasmohapatra <vivek@etla.org>
|
|
|
|
;; Created: 2002-01-05
|
2011-11-20 02:29:42 +00:00
|
|
|
;; Description: htmlize a buffer/source tree with optional hyperlinks
|
2009-11-19 20:21:01 +00:00
|
|
|
;; URL: http://rtfm.etla.org/emacs/htmlfontify/
|
|
|
|
;; Compatibility: Emacs23, Emacs22
|
|
|
|
;; Incompatibility: Emacs19, Emacs20, Emacs21
|
|
|
|
;; Last Updated: Thu 2009-11-19 01:31:21 +0000
|
|
|
|
|
|
|
|
;; 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
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;; I have made some changes to make it work for Emacs 22. A lot of
|
|
|
|
;; small bug fixes related to the format of text and overlay
|
|
|
|
;; properties (which might have changed since the beginning of 2003
|
|
|
|
;; when this file was originally written).
|
|
|
|
;;
|
|
|
|
;; The function `hfy-face-at' currently carries much of the burden of
|
|
|
|
;; my lacking understanding of the formats mentioned above and should
|
|
|
|
;; need some knowledgeable help.
|
|
|
|
;;
|
|
|
|
;; Another thing that maybe could be fixed is that overlay background
|
|
|
|
;; colors which are now only seen where there is text (in the XHTML
|
|
|
|
;; output). A bit of CSS tweaking is necessary there.
|
|
|
|
;;
|
|
|
|
;; The face 'default has a value :background "SystemWindow" for the
|
|
|
|
;; background color. There is no explicit notion that this should be
|
|
|
|
;; considered transparent, but I have assumed that it could be handled
|
|
|
|
;; like if it was here. (I am unsure that background and foreground
|
|
|
|
;; priorities are handled ok, but it looks ok in my tests now.)
|
|
|
|
;;
|
|
|
|
;; 2007-12-27 Lennart Borgman
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
;; Here's some elisp code to html-pretty-print an Emacs buffer, preserving
|
|
|
|
;; the Emacs syntax/whatever highlighting. It also knows how to drive etags
|
|
|
|
;; (exuberant-ctags or Emacs etags) and hyperlink the code according
|
|
|
|
;; to its (etags') output.
|
|
|
|
|
|
|
|
;; NOTE: Currently the hyperlinking code only knows how to drive GNU find
|
|
|
|
;; and the exuberant and GNU variants of etags : I do not know of any other
|
|
|
|
;; etags variants, but mechanisms have been provided to allow htmlfontify
|
|
|
|
;; to be taught how to drive them. As long as your version of find has
|
|
|
|
;; the -path test and is reasonably sane, you should be fine.
|
|
|
|
|
|
|
|
;; A sample of the htmlfontified / hyperlinked output of this module can be
|
|
|
|
;; found at http://rtfm.etla.org/sql/dbishell/src/ - it's not perfect, but
|
|
|
|
;; it's a hell of a lot faster and more thorough than I could hope to be
|
|
|
|
;; doing this by hand.
|
|
|
|
|
|
|
|
;; some user / horrified onlooker comments:
|
|
|
|
;; What? No! There's something deeply wrong here... (R. Shufflebotham)
|
|
|
|
;; You're a freak. (D. Silverstone)
|
|
|
|
;; Aren't we giving you enough to do? (J. Busuttil)
|
|
|
|
;; You're almost as messed up as Lexx is! (N. Graves-Morris)
|
|
|
|
|
|
|
|
;;; History:
|
|
|
|
;; Changes: moved to changelog (CHANGES) file.
|
|
|
|
|
|
|
|
;;; Code:
|
2016-11-21 19:50:15 +00:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
2009-11-19 20:21:01 +00:00
|
|
|
(require 'faces)
|
|
|
|
;; (`facep' `face-attr-construct' `x-color-values' `color-values' `face-name')
|
|
|
|
(require 'custom)
|
|
|
|
;; (`defgroup' `defcustom')
|
|
|
|
(require 'font-lock)
|
|
|
|
;; (`font-lock-fontify-region')
|
|
|
|
(require 'cus-edit)
|
|
|
|
|
2015-12-16 23:15:44 +00:00
|
|
|
(require 'htmlfontify-loaddefs)
|
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defconst htmlfontify-version 0.21)
|
|
|
|
|
|
|
|
(defconst hfy-meta-tags
|
|
|
|
(format "<meta name=\"generator\" content=\"emacs %s; htmlfontify %0.2f\" />"
|
|
|
|
emacs-version htmlfontify-version)
|
|
|
|
"The generator meta tag for this version of htmlfontify.")
|
|
|
|
|
|
|
|
(defconst htmlfontify-manual "Htmlfontify Manual"
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Copy and convert buffers and files to HTML, adding hyperlinks between files
|
|
|
|
\(driven by etags) if requested.
|
2009-11-19 20:21:01 +00:00
|
|
|
\nInteractive functions:
|
|
|
|
`htmlfontify-buffer'
|
|
|
|
`htmlfontify-run-etags'
|
|
|
|
`htmlfontify-copy-and-link-dir'
|
|
|
|
`htmlfontify-load-rgb-file'
|
|
|
|
`htmlfontify-unload-rgb-file'\n
|
|
|
|
In order to:\n
|
2011-01-27 17:04:07 +00:00
|
|
|
fontify a file you have open: \\[htmlfontify-buffer]
|
|
|
|
prepare the etags map for a directory: \\[htmlfontify-run-etags]
|
|
|
|
copy a directory, fontifying as you go: \\[htmlfontify-copy-and-link-dir]\n
|
2009-11-19 20:21:01 +00:00
|
|
|
The following might be useful when running non-windowed or in batch mode:
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(note that they shouldn't be necessary - we have a built in map)\n
|
2011-01-27 17:04:07 +00:00
|
|
|
load an X11 style rgb.txt file: \\[htmlfontify-load-rgb-file]
|
|
|
|
unload the current rgb.txt file: \\[htmlfontify-unload-rgb-file]\n
|
2009-11-19 20:21:01 +00:00
|
|
|
And here's a programmatic example:\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(defun rtfm-build-page-header (file style)
|
|
|
|
(format \"#define TEMPLATE red+black.html
|
2009-11-19 20:21:01 +00:00
|
|
|
#define DEBUG 1
|
|
|
|
#include <build/menu-dirlist|>\\n
|
|
|
|
html-css-url := /css/red+black.css
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
title := rtfm.etla.org ( %s / src/%s )
|
2009-11-19 20:21:01 +00:00
|
|
|
bodytag :=
|
|
|
|
head <=STYLESHEET;\\n
|
|
|
|
%s
|
|
|
|
STYLESHEET
|
|
|
|
main-title := rtfm / %s / src/%s\\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file))
|
|
|
|
|
|
|
|
\(defun rtfm-build-page-footer (file) \"\\nMAIN_CONTENT\\n\")
|
|
|
|
|
|
|
|
\(defun rtfm-build-source-docs (section srcdir destdir)
|
|
|
|
(interactive
|
|
|
|
\"s section[eg- emacs / p4-blame]:\\nD source-dir: \\nD output-dir: \")
|
2015-09-03 22:31:12 +00:00
|
|
|
(require \\='htmlfontify)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(hfy-load-tags-cache srcdir)
|
2015-09-03 22:31:12 +00:00
|
|
|
(let ((hfy-page-header \\='rtfm-build-page-header)
|
|
|
|
(hfy-page-footer \\='rtfm-build-page-footer)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(rtfm-section section)
|
|
|
|
(hfy-index-file \"index\"))
|
|
|
|
(htmlfontify-run-etags srcdir)
|
|
|
|
(htmlfontify-copy-and-link-dir srcdir destdir \".src\" \".html\")))")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defgroup htmlfontify nil
|
2010-02-21 21:05:13 +00:00
|
|
|
"Convert buffers and files to HTML."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'applications
|
2010-02-21 21:05:13 +00:00
|
|
|
:link '(variable-link htmlfontify-manual)
|
2014-01-25 19:15:42 +00:00
|
|
|
:link '(custom-manual "(htmlfontify) Top")
|
|
|
|
:link '(info-link "(htmlfontify) Customization")
|
2009-11-19 20:21:01 +00:00
|
|
|
:prefix "hfy-")
|
|
|
|
|
|
|
|
(defcustom hfy-page-header 'hfy-default-header
|
2011-11-30 16:33:05 +00:00
|
|
|
"Function called to build the header of the HTML source.
|
2011-01-27 17:04:07 +00:00
|
|
|
This is called with two arguments (the filename relative to the top
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
level source directory being etag'd and fontified), and a string containing
|
2011-01-27 17:04:07 +00:00
|
|
|
the <style>...</style> text to embed in the document.
|
2011-11-30 16:33:05 +00:00
|
|
|
It should return a string that will be used as the header for the
|
2011-01-27 17:04:07 +00:00
|
|
|
htmlfontified version of the source file.\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-page-footer'."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
;; FIXME: Why place such a :tag everywhere? Isn't it imposing your
|
|
|
|
;; own Custom preference on your users? --Stef
|
2009-11-19 20:21:01 +00:00
|
|
|
:tag "page-header"
|
|
|
|
:type '(function))
|
|
|
|
|
|
|
|
(defcustom hfy-split-index nil
|
2011-01-27 17:04:07 +00:00
|
|
|
"Whether or not to split the index `hfy-index-file' alphabetically.
|
|
|
|
If non-nil, the index is split on the first letter of each tag.
|
2011-11-30 16:33:05 +00:00
|
|
|
Useful when the index would otherwise be large and take
|
|
|
|
a long time to render or be difficult to navigate."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "split-index"
|
|
|
|
:type '(boolean))
|
|
|
|
|
|
|
|
(defcustom hfy-page-footer 'hfy-default-footer
|
2011-01-27 17:04:07 +00:00
|
|
|
"As `hfy-page-header', but generates the output footer.
|
|
|
|
It takes only one argument, the filename."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "page-footer"
|
|
|
|
:type '(function))
|
|
|
|
|
2011-11-30 16:33:05 +00:00
|
|
|
(defcustom hfy-extn ".html"
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"File extension used for output files."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "extension"
|
|
|
|
:type '(string))
|
|
|
|
|
|
|
|
(defcustom hfy-src-doc-link-style "text-decoration: underline;"
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
|
|
|
"String to add to the `<style> a' variant of an htmlfontify CSS class."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "src-doc-link-style"
|
|
|
|
:type '(string))
|
|
|
|
|
|
|
|
(defcustom hfy-src-doc-link-unstyle " text-decoration: none;"
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
|
|
|
"Regex to remove from the `<style> a' variant of an htmlfontify CSS class."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "src-doc-link-unstyle"
|
|
|
|
:type '(string))
|
|
|
|
|
|
|
|
(defcustom hfy-link-extn nil
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"File extension used for href links.
|
|
|
|
Useful where the htmlfontify output files are going to be processed
|
|
|
|
again, with a resulting change in file extension. If nil, then any
|
|
|
|
code using this should fall back to `hfy-extn'."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "link-extension"
|
|
|
|
:type '(choice string (const nil)))
|
|
|
|
|
|
|
|
(defcustom hfy-link-style-fun 'hfy-link-style-string
|
2011-01-27 17:04:07 +00:00
|
|
|
"Function to customize the appearance of hyperlinks.
|
|
|
|
Set this to a function, which will be called with one argument
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(a \"{ foo: bar; ...}\" CSS style-string) - it should return a copy of
|
2009-11-19 20:21:01 +00:00
|
|
|
its argument, altered so as to make any changes you want made for text which
|
|
|
|
is a hyperlink, in addition to being in the class to which that style would
|
|
|
|
normally be applied."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "link-style-function"
|
|
|
|
:type '(function))
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defcustom hfy-index-file "hfy-index"
|
|
|
|
"Name (sans extension) of the tag definition index file produced during
|
2009-11-19 20:21:01 +00:00
|
|
|
fontification-and-hyperlinking."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "index-file"
|
|
|
|
:type '(string))
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defcustom hfy-instance-file "hfy-instance"
|
|
|
|
"Name (sans extension) of the tag usage index file produced during
|
2009-11-19 20:21:01 +00:00
|
|
|
fontification-and-hyperlinking."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "instance-file"
|
|
|
|
:type '(string))
|
|
|
|
|
2011-01-27 17:04:07 +00:00
|
|
|
(defcustom hfy-html-quote-regex "\\([<\"&>]\\)"
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Regex to match (with a single back-reference per match) strings in HTML
|
|
|
|
which should be quoted with `hfy-html-quote' (and `hfy-html-quote-map')
|
2009-11-19 20:21:01 +00:00
|
|
|
to make them safe."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "html-quote-regex"
|
|
|
|
:type '(regexp))
|
|
|
|
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(define-obsolete-variable-alias 'hfy-init-kludge-hooks 'hfy-init-kludge-hook
|
|
|
|
"23.2")
|
|
|
|
(defcustom hfy-init-kludge-hook '(hfy-kludge-cperl-mode)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"List of functions to call when starting `htmlfontify-buffer' to do any
|
|
|
|
kludging necessary to get highlighting modes to behave as you want, even
|
2009-11-19 20:21:01 +00:00
|
|
|
when not running under a window system."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "init-kludge-hooks"
|
|
|
|
:type '(hook))
|
|
|
|
|
2012-10-23 15:06:07 +00:00
|
|
|
(define-obsolete-variable-alias 'hfy-post-html-hooks 'hfy-post-html-hook "24.3")
|
|
|
|
(defcustom hfy-post-html-hook nil
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"List of functions to call after creating and filling the HTML buffer.
|
2011-11-30 16:33:05 +00:00
|
|
|
These functions will be called with the HTML buffer as the current buffer."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "post-html-hooks"
|
|
|
|
:options '(set-auto-mode)
|
|
|
|
:type '(hook))
|
|
|
|
|
|
|
|
(defcustom hfy-default-face-def nil
|
2015-11-17 23:28:50 +00:00
|
|
|
"Fallback `defface' specification for the face `default', used when
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
`hfy-display-class' has been set (the normal htmlfontify way of extracting
|
|
|
|
potentially non-current face information doesn't necessarily work for
|
2015-11-17 23:28:50 +00:00
|
|
|
`default').\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
Example: I customize this to:\n
|
|
|
|
\((t :background \"black\" :foreground \"white\" :family \"misc-fixed\"))"
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "default-face-definition"
|
|
|
|
:type '(alist))
|
|
|
|
|
|
|
|
(defcustom hfy-etag-regex (concat ".*"
|
|
|
|
"\x7f" "\\([^\x01\n]+\\)"
|
|
|
|
"\x01" "\\([0-9]+\\)"
|
|
|
|
"," "\\([0-9]+\\)$"
|
|
|
|
"\\|" ".*\x7f[0-9]+,[0-9]+$")
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"Regex used to parse an etags entry: must have 3 subexps, corresponding,
|
2009-11-19 20:21:01 +00:00
|
|
|
in order, to:\n
|
|
|
|
1 - The tag
|
|
|
|
2 - The line
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
3 - The char (point) at which the tag occurs."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "etag-regex"
|
|
|
|
:type '(regexp))
|
|
|
|
|
|
|
|
(defcustom hfy-html-quote-map '(("\"" """)
|
|
|
|
("<" "<" )
|
|
|
|
("&" "&" )
|
|
|
|
(">" ">" ))
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Alist of char -> entity mappings used to make the text HTML-safe."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "html-quote-map"
|
|
|
|
:type '(alist :key-type (string)))
|
2011-04-15 12:35:32 +00:00
|
|
|
(defconst hfy-e2x-etags-cmd "for src in `find . -type f`;
|
2009-11-19 20:21:01 +00:00
|
|
|
do
|
|
|
|
ETAGS=%s;
|
|
|
|
case ${src} in
|
|
|
|
*.ad[absm]|*.[CFHMSacfhlmpsty]|*.def|*.in[cs]|*.s[as]|*.src|*.cc|\\
|
|
|
|
*.hh|*.[chy]++|*.[ch]pp|*.[chy]xx|*.pdb|*.[ch]s|*.[Cc][Oo][Bb]|\\
|
|
|
|
*.[eh]rl|*.f90|*.for|*.java|*.[cem]l|*.clisp|*.lisp|*.[Ll][Ss][Pp]|\\
|
|
|
|
[Mm]akefile*|*.pas|*.[Pp][LlMm]|*.psw|*.lm|*.pc|*.prolog|*.oak|\\
|
|
|
|
*.p[sy]|*.sch|*.scheme|*.[Ss][Cc][Mm]|*.[Ss][Mm]|*.bib|*.cl[os]|\\
|
|
|
|
*.ltx|*.sty|*.TeX|*.tex|*.texi|*.texinfo|*.txi|*.x[bp]m|*.yy|\\
|
|
|
|
*.[Ss][Qq][Ll])
|
|
|
|
${ETAGS} -o- ${src};
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
FTYPE=`file ${src}`;
|
|
|
|
case ${FTYPE} in
|
|
|
|
*script*text*)
|
|
|
|
${ETAGS} -o- ${src};
|
|
|
|
;;
|
|
|
|
*text*)
|
|
|
|
SHEBANG=`head -n1 ${src} | grep '#!' -c`;
|
|
|
|
if [ ${SHEBANG} -eq 1 ];
|
|
|
|
then
|
|
|
|
${ETAGS} -o- ${src};
|
|
|
|
fi;
|
|
|
|
;;
|
|
|
|
esac;
|
|
|
|
;;
|
|
|
|
esac;
|
|
|
|
done;")
|
|
|
|
|
2011-04-15 12:35:32 +00:00
|
|
|
(defconst hfy-etags-cmd-alist-default
|
|
|
|
`(("emacs etags" . ,hfy-e2x-etags-cmd)
|
|
|
|
("exuberant ctags" . "%s -R -f -" )))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2011-04-15 12:35:32 +00:00
|
|
|
(defcustom hfy-etags-cmd-alist
|
|
|
|
hfy-etags-cmd-alist-default
|
|
|
|
"Alist of possible shell commands that will generate etags output that
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
`htmlfontify' can use. `%s' will be replaced by `hfy-etags-bin'."
|
2011-04-15 12:35:32 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "etags-cmd-alist"
|
|
|
|
:type '(alist :key-type (string) :value-type (string)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defcustom hfy-etags-bin "etags"
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Location of etags binary (we begin by assuming it's in your path).\n
|
2009-11-19 20:21:01 +00:00
|
|
|
Note that if etags is not in your path, you will need to alter the shell
|
|
|
|
commands in `hfy-etags-cmd-alist'."
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "etags-bin"
|
|
|
|
:type '(file))
|
|
|
|
|
|
|
|
(defcustom hfy-shell-file-name "/bin/sh"
|
2011-11-30 16:33:05 +00:00
|
|
|
"Shell (Bourne or compatible) to invoke for complex shell operations."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "shell-file-name"
|
|
|
|
:type '(file))
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defcustom hfy-ignored-properties '(read-only
|
2009-12-09 05:56:53 +00:00
|
|
|
intangible
|
|
|
|
modification-hooks
|
|
|
|
insert-in-front-hooks
|
|
|
|
insert-behind-hooks
|
|
|
|
point-entered
|
|
|
|
point-left)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Properties to omit when copying a fontified buffer for HTML transformation."
|
2009-12-09 05:56:53 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "ignored-properties"
|
|
|
|
:type '(repeat symbol))
|
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-which-etags ()
|
2011-11-17 17:40:48 +00:00
|
|
|
"Return a string indicating which flavor of etags we are using."
|
2017-01-17 17:24:29 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(condition-case nil
|
|
|
|
(when (eq (call-process hfy-etags-bin nil t nil "--version") 0)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(cond
|
2017-12-13 18:55:29 +00:00
|
|
|
((search-forward "exube" nil t) "exuberant ctags")
|
|
|
|
((search-forward "GNU E" nil t) "emacs etags")))
|
2017-01-17 17:24:29 +00:00
|
|
|
;; Return nil if the etags binary isn't executable (Bug#25468).
|
|
|
|
(file-error nil))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defcustom hfy-etags-cmd
|
2011-04-15 12:35:32 +00:00
|
|
|
;; We used to wrap this in a `eval-and-compile', but:
|
|
|
|
;; - it had no effect because this expression was not seen by the
|
|
|
|
;; byte-compiler (defcustom used to quote this argument).
|
|
|
|
;; - it signals an error (`hfy-which-etags' is not defined at compile-time).
|
|
|
|
;; - we want this auto-detection to reflect the system on which Emacs is run
|
|
|
|
;; rather than the one on which it's compiled.
|
|
|
|
(cdr (assoc (hfy-which-etags) hfy-etags-cmd-alist))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"The etags equivalent command to run in a source directory to generate a tags
|
2009-11-19 20:21:01 +00:00
|
|
|
file for the whole source tree from there on down. The command should emit
|
|
|
|
the etags output on stdout.\n
|
2012-02-28 08:17:21 +00:00
|
|
|
Two canned commands are provided - they drive Emacs's etags and
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
exuberant-ctags' etags respectively."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "etags-command"
|
2011-04-15 12:35:32 +00:00
|
|
|
:type (let ((clist (list '(string))))
|
|
|
|
(dolist (C hfy-etags-cmd-alist)
|
|
|
|
(push (list 'const :tag (car C) (cdr C)) clist))
|
|
|
|
(cons 'choice clist)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defcustom hfy-istext-command "file %s | sed -e 's@^[^:]*:[ \t]*@@'"
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"Command to run with the name of a file, to see whether it is a text file
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
or not. The command should emit a string containing the word `text' if
|
|
|
|
the file is a text file, and a string not containing `text' otherwise."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "istext-command"
|
|
|
|
:type '(string))
|
|
|
|
|
|
|
|
(defcustom hfy-find-cmd
|
|
|
|
"find . -type f \\! -name \\*~ \\! -name \\*.flc \\! -path \\*/CVS/\\*"
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"Find command used to harvest a list of files to attempt to fontify."
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "find-command"
|
|
|
|
:type '(string))
|
|
|
|
|
|
|
|
(defcustom hfy-display-class nil
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
"Display class to use to determine which display class to use when
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
calculating a face's attributes. This is useful when, for example, you
|
2009-11-19 20:21:01 +00:00
|
|
|
are running Emacs on a tty or in batch mode, and want htmlfontify to have
|
|
|
|
access to the face spec you would use if you were connected to an X display.\n
|
|
|
|
Some valid class specification elements are:\n
|
2015-11-17 23:28:50 +00:00
|
|
|
(class color)
|
|
|
|
(class grayscale)
|
|
|
|
(background dark)
|
|
|
|
(background light)
|
|
|
|
(type x-toolkit)
|
|
|
|
(type tty)
|
|
|
|
(type motif)
|
|
|
|
(type lucid)
|
2009-11-19 20:21:01 +00:00
|
|
|
Multiple values for a tag may be combined, to indicate that any one or more
|
|
|
|
of these values in the specification key constitutes a match, eg:\n
|
2017-12-13 07:18:35 +00:00
|
|
|
\((class color grayscale) (type tty)) would match any of:\n
|
2015-11-17 23:28:50 +00:00
|
|
|
((class color))
|
|
|
|
((class grayscale))
|
|
|
|
((class color grayscale))
|
|
|
|
((class color foo))
|
|
|
|
((type tty))
|
|
|
|
((type tty) (class color))\n
|
2009-11-19 20:21:01 +00:00
|
|
|
and so on."
|
|
|
|
:type '(alist :key-type (symbol) :value-type (symbol))
|
|
|
|
:group 'htmlfontify
|
|
|
|
:tag "display-class"
|
|
|
|
:options '((type (choice (const :tag "X11" x-toolkit)
|
|
|
|
(const :tag "Terminal" tty )
|
|
|
|
(const :tag "Lucid Toolkit" lucid )
|
|
|
|
(const :tag "Motif Toolkit" motif )))
|
|
|
|
|
2011-11-13 07:48:23 +00:00
|
|
|
(class (choice (const :tag "Color" color )
|
|
|
|
(const :tag "Grayscale" grayscale)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(background (choice (const :tag "Dark" dark )
|
|
|
|
(const :tag "Bright" light ))) ))
|
|
|
|
|
2018-04-20 22:34:39 +00:00
|
|
|
(define-obsolete-variable-alias 'hfy-optimisations 'hfy-optimizations "25.1")
|
2015-04-06 06:40:54 +00:00
|
|
|
(defcustom hfy-optimizations (list 'keep-overlays)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Optimizations to turn on: So far, the following have been implemented:\n
|
2009-11-19 20:21:01 +00:00
|
|
|
merge-adjacent-tags: If two (or more) span tags are adjacent, identical and
|
|
|
|
separated by nothing more than whitespace, they will
|
|
|
|
be merged into one span.
|
|
|
|
zap-comment-links : Suppress hyperlinking of tags found in comments.
|
|
|
|
zap-string-links : Suppress hyperlinking of tags found in strings.
|
|
|
|
div-wrapper : Add <div class=\"default\"> </div> tags around the
|
|
|
|
output.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
keep-overlays : More of a bell (or possibly whistle) than an
|
|
|
|
optimization - If on, preserve overlay highlighting
|
|
|
|
(cf ediff or goo-font-lock) as well as basic faces.\n
|
2012-03-17 14:03:54 +00:00
|
|
|
body-text-only : Emit only body-text. In concrete terms,
|
2017-11-28 16:50:05 +00:00
|
|
|
1. Suppress calls to `hfy-page-header' and
|
2012-03-17 14:03:54 +00:00
|
|
|
`hfy-page-footer'
|
|
|
|
2. Pretend that `div-wrapper' option above is
|
|
|
|
turned off
|
|
|
|
3. Don't enclose output in <pre> </pre> tags
|
2009-11-19 20:21:01 +00:00
|
|
|
And the following are planned but not yet available:\n
|
|
|
|
kill-context-leak : Suppress hyperlinking between files highlighted by
|
|
|
|
different modes.\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
Note: like compiler optimizations, these optimize the _output_ of the code,
|
2009-11-19 20:21:01 +00:00
|
|
|
not the processing of the source itself, and are therefore likely to slow
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
htmlfontify down, at least a little. Except for skip-refontification,
|
2009-11-19 20:21:01 +00:00
|
|
|
which can never slow you down, but may result in incomplete fontification."
|
|
|
|
:type '(set (const :tag "merge-adjacent-tags" merge-adjacent-tags )
|
|
|
|
(const :tag "zap-comment-links" zap-comment-links )
|
|
|
|
(const :tag "zap-string-links" zap-string-links )
|
|
|
|
(const :tag "skip-refontification" skip-refontification)
|
|
|
|
(const :tag "kill-context-leak" kill-context-leak )
|
|
|
|
(const :tag "div-wrapper" div-wrapper )
|
2012-03-17 14:03:54 +00:00
|
|
|
(const :tag "keep-overlays" keep-overlays )
|
|
|
|
(const :tag "body-text-only" body-text-only ))
|
2009-11-19 20:21:01 +00:00
|
|
|
:group 'htmlfontify
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
:tag "optimizations")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defvar hfy-tags-cache nil
|
2009-11-19 20:21:01 +00:00
|
|
|
"Alist of the form:\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\((\"/src/dir/0\" . tag-hash0) (\"/src/dir/1\" tag-hash1) ...)\n
|
|
|
|
Each tag hash entry then contains entries of the form:\n
|
2009-11-19 20:21:01 +00:00
|
|
|
\"tag_string\" => ((\"file/name.ext\" line char) ... )\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
ie an alist mapping (relative) file paths to line and character offsets.\n
|
|
|
|
See also `hfy-load-tags-cache'.")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defvar hfy-tags-sortl nil
|
|
|
|
"Alist of the form ((\"/src/dir\" . (tag0 tag1 tag2)) ... )\n
|
|
|
|
where the tags are stored in descending order of length.\n
|
|
|
|
See also `hfy-load-tags-cache'.")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defvar hfy-tags-rmap nil
|
|
|
|
"Alist of the form ((\"/src/dir\" . tag-rmap-hash))\n
|
|
|
|
where tag-rmap-hash has entries of the form:
|
2009-11-19 20:21:01 +00:00
|
|
|
\"tag_string\" => ( \"file/name.ext\" line char )
|
|
|
|
Unlike `hfy-tags-cache' these are the locations of occurrences of
|
|
|
|
tagged items, not the locations of their definitions.")
|
|
|
|
|
|
|
|
(defvar hfy-style-assoc 'please-ignore-this-line
|
|
|
|
"An assoc representing/describing an Emacs face.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
Properties may be repeated, in which case later properties should be
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
treated as if they were inherited from a `parent' font.
|
2009-11-19 20:21:01 +00:00
|
|
|
\(For some properties, only the first encountered value is of any importance,
|
|
|
|
for others the values might be cumulative, and for others they might be
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
cumulative in a complex way.)\n
|
2009-11-19 20:21:01 +00:00
|
|
|
Some examples:\n
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
\(hfy-face-to-style \\='default) =>
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
((\"background\" . \"rgb(0, 0, 0)\")
|
|
|
|
(\"color\" . \"rgb(255, 255, 255)\")
|
|
|
|
(\"font-style\" . \"normal\")
|
|
|
|
(\"font-weight\" . \"500\")
|
|
|
|
(\"font-stretch\" . \"normal\")
|
|
|
|
(\"font-family\" . \"misc-fixed\")
|
|
|
|
(\"font-size\" . \"13pt\")
|
|
|
|
(\"text-decoration\" . \"none\"))\n
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
\(hfy-face-to-style \\='Info-title-3-face) =>
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
((\"font-weight\" . \"700\")
|
|
|
|
(\"font-family\" . \"helv\")
|
|
|
|
(\"font-size\" . \"120%\")
|
|
|
|
(\"text-decoration\" . \"none\"))\n")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defvar hfy-sheet-assoc 'please-ignore-this-line
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"An assoc with elements of the form (face-name style-name . style-string):\n
|
2016-12-07 19:29:54 +00:00
|
|
|
\((default \"default\" . \"{background: black; color: white}\")
|
|
|
|
(font-lock-string-face \"string\" . \"{color: rgb(64,224,208)}\"))" )
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defvar hfy-facemap-assoc 'please-ignore-this-line
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"An assoc of (point . FACE-SYMBOL) or (point . DEFFACE-LIST)
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
and (point . \\='end) elements, in descending order of point value
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(ie from the file's end to its beginning).\n
|
|
|
|
The map is in reverse order because inserting a <style> tag (or any other
|
|
|
|
string) at `point' invalidates the map for all entries with a greater value of
|
|
|
|
point. By traversing the map from greatest to least point, we still invalidate
|
|
|
|
the map as we go, but only those points we have already dealt with (and
|
|
|
|
therefore no longer care about) will be invalid at any time.\n
|
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics.
In docstrings, escape apostrophes that would otherwise be translated
to curved quotes using the newer, simpler rules.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-lang.el (math-read-giac-subscr)
(math-read-math-subscr):
* lisp/calc/calc-misc.el (report-calc-bug):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/dabbrev.el (dabbrev-expand):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emulation/viper-cmd.el (viper-toggle-search-style):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-arg.el (eshell-parse-arguments):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/files-x.el (modify-file-local-variable):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer)
(filesets-update-pre010505):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
* lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer)
(gnus-agent-fetch-headers):
* lisp/gnus/gnus-int.el (gnus-start-news-server):
* lisp/gnus/gnus-registry.el:
(gnus-registry--split-fancy-with-parent-internal):
* lisp/gnus/gnus-score.el (gnus-summary-increase-score):
* lisp/gnus/gnus-start.el (gnus-convert-old-newsrc):
* lisp/gnus/gnus-topic.el (gnus-topic-rename):
* lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/gnus/spam.el (spam-check-blackholes):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/tramp-cache.el:
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question)
(dun-rooms, dun-endgame-questions):
* lisp/progmodes/ada-mode.el (ada-goto-matching-start):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/antlr-mode.el (antlr-options-alists):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/server.el (server-get-auth-key):
* lisp/subr.el (version-to-list):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
* test/automated/tramp-tests.el (tramp-test33-asynchronous-requests):
Use directed rather than neutral quotes in diagnostics.
2015-08-25 06:39:33 +00:00
|
|
|
\\='((64820 . end)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(64744 . font-lock-comment-face)
|
|
|
|
(64736 . end)
|
|
|
|
(64722 . font-lock-string-face)
|
|
|
|
(64630 . end)
|
|
|
|
(64623 . font-lock-string-face)
|
|
|
|
(64449 . end)
|
|
|
|
(64446 . font-lock-keyword-face)
|
|
|
|
(64406 . end)
|
|
|
|
(64395 . font-lock-constant-face)
|
|
|
|
(64393 . end)
|
|
|
|
(64386 . font-lock-keyword-face)
|
|
|
|
(64379 . end)
|
2009-11-19 20:21:01 +00:00
|
|
|
;; big similar section elided. You get the idea.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(4285 . font-lock-constant-face)
|
|
|
|
(4285 . end)
|
|
|
|
(4221 . font-lock-comment-face)
|
|
|
|
(4221 . end)
|
|
|
|
(4197 . font-lock-constant-face)
|
|
|
|
(4197 . end)
|
|
|
|
(1 . font-lock-comment-face))")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defvar hfy-tmpfont-stack nil
|
|
|
|
"An alist of derived fonts resulting from overlays.")
|
|
|
|
|
|
|
|
(defconst hfy-hex-regex "[0-9A-Fa-f]")
|
|
|
|
|
|
|
|
(defconst hfy-triplet-regex
|
|
|
|
(concat
|
|
|
|
"\\(" hfy-hex-regex hfy-hex-regex "\\)"
|
|
|
|
"\\(" hfy-hex-regex hfy-hex-regex "\\)"
|
|
|
|
"\\(" hfy-hex-regex hfy-hex-regex "\\)"))
|
|
|
|
|
|
|
|
(defun hfy-interq (set-a set-b)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Return the intersection (using `eq') of two lists SET-A and SET-B."
|
2009-11-19 20:21:01 +00:00
|
|
|
(let ((sa set-a) (interq nil) (elt nil))
|
|
|
|
(while sa
|
|
|
|
(setq elt (car sa)
|
|
|
|
sa (cdr sa))
|
2011-01-27 17:04:07 +00:00
|
|
|
(if (memq elt set-b) (setq interq (cons elt interq))))
|
|
|
|
interq))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2018-03-05 01:38:43 +00:00
|
|
|
(defun hfy-color-vals (color)
|
|
|
|
"Where COLOR is a color name or #XXXXXX style triplet, return a
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
list of three (16 bit) rgb values for said color.\n
|
2018-03-05 01:38:43 +00:00
|
|
|
If a window system is unavailable, calls `hfy-fallback-color-values'."
|
|
|
|
(if (string-match hfy-triplet-regex color)
|
2009-11-19 20:21:01 +00:00
|
|
|
(mapcar
|
2018-03-05 01:38:43 +00:00
|
|
|
(lambda (x) (* (string-to-number (match-string x color) 16) 257))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
'(1 2 3))
|
2018-03-05 01:38:43 +00:00
|
|
|
;;(message ">> %s" color)
|
2009-11-19 20:21:01 +00:00
|
|
|
(if window-system
|
|
|
|
(if (fboundp 'color-values)
|
2018-03-05 01:38:43 +00:00
|
|
|
(color-values color)
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "[%S]" window-system)
|
2018-03-05 01:38:43 +00:00
|
|
|
(x-color-values color))
|
2011-12-05 08:55:25 +00:00
|
|
|
;; blarg - tty colors are no good - go fetch some X colors:
|
2018-03-05 01:38:43 +00:00
|
|
|
(hfy-fallback-color-values color))))
|
|
|
|
(define-obsolete-function-alias 'hfy-colour-vals 'hfy-color-vals "27.1")
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defvar hfy-cperl-mode-kludged-p nil)
|
|
|
|
|
|
|
|
(defun hfy-kludge-cperl-mode ()
|
2011-11-17 09:09:20 +00:00
|
|
|
"CPerl mode does its damnedest not to do some of its fontification when not
|
2009-11-19 20:21:01 +00:00
|
|
|
in a windowing system - try to trick it..."
|
|
|
|
(if (not hfy-cperl-mode-kludged-p)
|
|
|
|
(progn (if (not window-system)
|
|
|
|
(let ((window-system 'htmlfontify))
|
|
|
|
(eval-and-compile (require 'cperl-mode))
|
|
|
|
(setq cperl-syntaxify-by-font-lock t)))
|
|
|
|
(setq hfy-cperl-mode-kludged-p t))) )
|
|
|
|
|
2011-11-30 16:33:05 +00:00
|
|
|
(defun hfy-opt (symbol)
|
|
|
|
"Is option SYMBOL set."
|
2015-04-06 06:40:54 +00:00
|
|
|
(memq symbol hfy-optimizations))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-default-header (file style)
|
|
|
|
"Default value for `hfy-page-header'.
|
|
|
|
FILE is the name of the file.
|
|
|
|
STYLE is the inline CSS stylesheet (or tag referring to an external sheet)."
|
|
|
|
;; (format "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
|
|
|
|
;; <html>\n <head>\n <title>%s</title>\n %s\n </head>\n <body>\n" file style))
|
|
|
|
(format "<?xml version=\"1.0\" encoding=\"utf-8\"?>
|
|
|
|
<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"
|
|
|
|
\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
|
|
|
|
<html xmlns=\"http://www.w3.org/1999/xhtml\">
|
|
|
|
<head>
|
|
|
|
<title>%s</title>
|
|
|
|
%s
|
|
|
|
<script type=\"text/javascript\"><!--
|
|
|
|
// this function is needed to work around
|
|
|
|
// a bug in IE related to element attributes
|
|
|
|
function hasClass(obj)
|
|
|
|
{
|
|
|
|
var result = false;
|
|
|
|
if (obj.getAttributeNode(\"class\") != null)
|
|
|
|
{
|
|
|
|
result = obj.getAttributeNode(\"class\").value;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
function stripe(id)
|
|
|
|
{
|
|
|
|
// the flag we'll use to keep track of
|
|
|
|
// whether the current row is odd or even
|
|
|
|
var even = false;
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
// if arguments are provided to specify the colors
|
2017-11-22 22:52:11 +00:00
|
|
|
// of the even & odd rows, then use them;
|
2009-11-19 20:21:01 +00:00
|
|
|
// otherwise use the following defaults:
|
|
|
|
var evenColor = arguments[1] ? arguments[1] : \"#fff\";
|
|
|
|
var oddColor = arguments[2] ? arguments[2] : \"#ddd\";
|
|
|
|
|
|
|
|
// obtain a reference to the desired table
|
|
|
|
// if no such table exists, abort
|
|
|
|
var table = document.getElementById(id);
|
|
|
|
if (! table) { return; }
|
|
|
|
|
|
|
|
// by definition, tables can have more than one tbody
|
|
|
|
// element, so we'll have to get the list of child
|
|
|
|
// <tbody>s
|
|
|
|
var tbodies = table.getElementsByTagName(\"tbody\");
|
|
|
|
|
|
|
|
// and iterate through them...
|
|
|
|
for (var h = 0; h < tbodies.length; h++)
|
|
|
|
{
|
|
|
|
// find all the <tr> elements...
|
|
|
|
var trs = tbodies[h].getElementsByTagName(\"tr\");
|
|
|
|
|
|
|
|
// ... and iterate through them
|
|
|
|
for (var i = 0; i < trs.length; i++)
|
|
|
|
{
|
|
|
|
// avoid rows that have a class attribute
|
|
|
|
// or backgroundColor style
|
|
|
|
if (! hasClass(trs[i]) &&
|
|
|
|
! trs[i].style.backgroundColor)
|
|
|
|
{
|
|
|
|
// get all the cells in this row...
|
|
|
|
var tds = trs[i].getElementsByTagName(\"td\");
|
|
|
|
|
|
|
|
// and iterate through them...
|
|
|
|
for (var j = 0; j < tds.length; j++)
|
|
|
|
{
|
|
|
|
var mytd = tds[j];
|
|
|
|
|
|
|
|
// avoid cells that have a class attribute
|
|
|
|
// or backgroundColor style
|
|
|
|
if (! hasClass(mytd) &&
|
|
|
|
! mytd.style.backgroundColor)
|
|
|
|
{
|
|
|
|
mytd.style.backgroundColor =
|
|
|
|
even ? evenColor : oddColor;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// flip from odd to even, or vice-versa
|
|
|
|
even = ! even;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-11-26 15:22:27 +00:00
|
|
|
|
|
|
|
function toggle_invis( name )
|
|
|
|
{
|
|
|
|
var filter =
|
|
|
|
{ acceptNode:
|
|
|
|
function( node )
|
|
|
|
{ var classname = node.id;
|
|
|
|
if( classname )
|
|
|
|
{ var classbase = classname.substr( 0, name.length );
|
|
|
|
if( classbase == name ) { return NodeFilter.FILTER_ACCEPT; } }
|
|
|
|
return NodeFilter.FILTER_SKIP; } };
|
|
|
|
var walker = document.createTreeWalker( document.body ,
|
|
|
|
NodeFilter.SHOW_ELEMENT ,
|
|
|
|
filter ,
|
|
|
|
false );
|
|
|
|
while( walker.nextNode() )
|
|
|
|
{
|
|
|
|
var e = walker.currentNode;
|
|
|
|
if( e.style.display == \"none\" ) { e.style.display = \"inline\"; }
|
|
|
|
else { e.style.display = \"none\"; }
|
|
|
|
}
|
|
|
|
}
|
2009-11-19 20:21:01 +00:00
|
|
|
--> </script>
|
|
|
|
</head>
|
|
|
|
<body onload=\"stripe('index'); return true;\">\n"
|
2013-02-22 01:32:45 +00:00
|
|
|
(mapconcat 'hfy-html-quote (mapcar 'char-to-string file) "") style))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun hfy-default-footer (_file)
|
2009-11-19 20:21:01 +00:00
|
|
|
"Default value for `hfy-page-footer'.
|
|
|
|
FILE is the name of the file being rendered, in case it is needed."
|
|
|
|
"\n </body>\n</html>\n")
|
|
|
|
|
|
|
|
(defun hfy-link-style-string (style-string)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Replace the end of a CSS style declaration STYLE-STRING with the contents
|
2009-11-19 20:21:01 +00:00
|
|
|
of the variable `hfy-src-doc-link-style', removing text matching the regex
|
|
|
|
`hfy-src-doc-link-unstyle' first, if necessary."
|
2018-03-05 01:38:43 +00:00
|
|
|
;;(message "hfy-color-vals");;DBUG
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (string-match hfy-src-doc-link-unstyle style-string)
|
|
|
|
(setq style-string (replace-match "" 'fixed-case 'literal style-string)))
|
|
|
|
(if (and (not (string-match hfy-src-doc-link-style style-string))
|
|
|
|
(string-match "} *$" style-string))
|
|
|
|
(concat (replace-match hfy-src-doc-link-style
|
|
|
|
'fixed-case
|
|
|
|
'literal
|
2011-01-27 17:04:07 +00:00
|
|
|
style-string) " }")
|
|
|
|
style-string))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; utility functions - cast emacs style specification values into their
|
|
|
|
;; css2 equivalents:
|
2018-03-05 01:38:43 +00:00
|
|
|
(defun hfy-triplet (color)
|
|
|
|
"Takes a COLOR name (string) and return a CSS rgb(R, G, B) triplet string.
|
2009-11-19 20:21:01 +00:00
|
|
|
Uses the definition of \"white\" to map the numbers to the 0-255 range, so
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
if you've redefined white, (esp. if you've redefined it to have a triplet
|
|
|
|
member lower than that of the color you are processing) strange things
|
|
|
|
may happen."
|
2018-03-05 01:38:43 +00:00
|
|
|
;;(message "hfy-color-vals");;DBUG
|
2013-06-26 06:59:48 +00:00
|
|
|
;; TODO? Can we do somehow do better than this?
|
|
|
|
(cond
|
2018-03-05 01:38:43 +00:00
|
|
|
((equal color "unspecified-fg") (setq color "black"))
|
|
|
|
((equal color "unspecified-bg") (setq color "white")))
|
|
|
|
(let ((white (mapcar (lambda (I) (float (1+ I))) (hfy-color-vals "white")))
|
|
|
|
(rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-color-vals color))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(if rgb16
|
|
|
|
;;(apply 'format "rgb(%d, %d, %d)"
|
|
|
|
;; Use #rrggbb instead, it is smaller
|
|
|
|
(apply 'format "#%02x%02x%02x"
|
|
|
|
(mapcar (lambda (X)
|
|
|
|
(* (/ (nth X rgb16)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(nth X white)) 255))
|
|
|
|
'(0 1 2))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-family (family) (list (cons "font-family" family)))
|
2018-03-05 01:38:43 +00:00
|
|
|
(defun hfy-bgcol (color) (list (cons "background" (hfy-triplet color))))
|
|
|
|
(defun hfy-color (color) (list (cons "color" (hfy-triplet color))))
|
|
|
|
(define-obsolete-function-alias 'hfy-colour 'hfy-color "27.1")
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-width (width) (list (cons "font-stretch" (symbol-name width))))
|
|
|
|
|
|
|
|
(defcustom hfy-font-zoom 1.05
|
|
|
|
"Font scaling from Emacs to HTML."
|
|
|
|
:type 'float
|
|
|
|
:group 'htmlfontify)
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defun hfy-size (height)
|
2009-11-19 20:21:01 +00:00
|
|
|
"Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT.
|
|
|
|
Does not cope with the case where height is a function to be applied to
|
|
|
|
the height of the underlying font."
|
2013-06-26 06:59:48 +00:00
|
|
|
;; In ttys, the default face has :height == 1.
|
|
|
|
(and (not (display-graphic-p)) (equal 1 height) (setq height 100))
|
2009-11-19 20:21:01 +00:00
|
|
|
(list
|
|
|
|
(cond
|
|
|
|
;;(t (cons "font-size" ": 1em"))
|
|
|
|
((floatp height)
|
|
|
|
(cons "font-size" (format "%d%%" (* (* hfy-font-zoom height) 100))))
|
|
|
|
((integerp height)
|
|
|
|
(cons "font-size" (format "%dpt" (/ (* hfy-font-zoom height) 10 )))) )) )
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
(defun hfy-slant (slant)
|
|
|
|
"Derive a font-style CSS specifier from the Emacs :slant attribute SLANT:
|
2009-11-19 20:21:01 +00:00
|
|
|
CSS does not define the reverse-* styles, so just maps those to the
|
|
|
|
regular specifiers."
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(list (cons "font-style"
|
|
|
|
(or (cdr (assq slant '((italic . "italic")
|
|
|
|
(reverse-italic . "italic" )
|
|
|
|
(oblique . "oblique")
|
|
|
|
(reverse-oblique . "oblique"))))
|
|
|
|
"normal"))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-weight (weight)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Derive a font-weight CSS specifier from an Emacs weight spec symbol WEIGHT."
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(list (cons "font-weight" (cdr (assq weight '((ultra-bold . "900")
|
|
|
|
(extra-bold . "800")
|
|
|
|
(bold . "700")
|
|
|
|
(semi-bold . "600")
|
|
|
|
(normal . "500")
|
|
|
|
(semi-light . "400")
|
|
|
|
(light . "300")
|
|
|
|
(extra-light . "200")
|
|
|
|
(ultra-light . "100")))))))
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-box-to-border-assoc (spec)
|
|
|
|
(if spec
|
|
|
|
(let ((tag (car spec))
|
|
|
|
(val (cadr spec)))
|
2016-11-21 19:50:15 +00:00
|
|
|
(cons (cl-case tag
|
2018-03-05 01:38:43 +00:00
|
|
|
(:color (cons "color" val))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(:width (cons "width" val))
|
|
|
|
(:style (cons "style" val)))
|
|
|
|
(hfy-box-to-border-assoc (cddr spec))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-box-to-style (spec)
|
|
|
|
(let* ((css (hfy-box-to-border-assoc spec))
|
2018-03-05 01:38:43 +00:00
|
|
|
(col (cdr (assoc "color" css)))
|
2009-11-19 20:21:01 +00:00
|
|
|
(s (cdr (assoc "style" css))))
|
|
|
|
(list
|
2018-03-05 01:38:43 +00:00
|
|
|
(if col (cons "border-color" (cdr (assoc "color" css))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(cons "border-width" (format "%dpx" (or (cdr (assoc "width" css)) 1)))
|
2016-11-21 19:50:15 +00:00
|
|
|
(cons "border-style" (cl-case s
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(released-button "outset")
|
|
|
|
(pressed-button "inset" )
|
|
|
|
(t "solid" ))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-box (box)
|
|
|
|
"Derive CSS border-* attributes from the Emacs :box attribute BOX."
|
|
|
|
(if box
|
|
|
|
(cond
|
|
|
|
((integerp box) (list (cons "border-width" (format "%dpx" box))))
|
|
|
|
((stringp box) (list (cons "border" (format "solid %s 1px" box))))
|
|
|
|
((listp box) (hfy-box-to-style box) ))) )
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun hfy-decor (tag _val)
|
2009-11-19 20:21:01 +00:00
|
|
|
"Derive CSS text-decoration specifiers from various Emacs font attributes.
|
|
|
|
TAG is an Emacs font attribute key (eg :underline).
|
|
|
|
VAL is ignored."
|
|
|
|
(list
|
2009-11-19 20:47:40 +00:00
|
|
|
;; FIXME: Why not '("text-decoration" . "underline")? --Stef
|
2016-11-21 19:50:15 +00:00
|
|
|
(cl-case tag
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(:underline (cons "text-decoration" "underline" ))
|
|
|
|
(:overline (cons "text-decoration" "overline" ))
|
|
|
|
(:strike-through (cons "text-decoration" "line-through")))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun hfy-invisible (&optional _val)
|
2009-11-19 20:21:01 +00:00
|
|
|
"This text should be invisible.
|
|
|
|
Do something in CSS to make that happen.
|
|
|
|
VAL is ignored here."
|
|
|
|
'(("display" . "none")))
|
|
|
|
|
|
|
|
(defun hfy-combined-face-spec (face)
|
|
|
|
"Return a `defface' style alist of possible specifications for FACE.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
Entries resulting from customization (`custom-set-faces') will take
|
2009-11-19 20:21:01 +00:00
|
|
|
precedence."
|
2011-01-27 17:04:07 +00:00
|
|
|
(append
|
|
|
|
(if (and hfy-display-class hfy-default-face-def (eq face 'default))
|
|
|
|
hfy-default-face-def)
|
|
|
|
(get face 'saved-face)
|
|
|
|
(get face 'face-defface-spec)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-face-attr-for-class (face &optional class)
|
|
|
|
"Return the face attributes for FACE.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
If CLASS is set, it must be a `defface' alist key [see below],
|
2009-11-19 20:21:01 +00:00
|
|
|
in which case the first face specification returned by `hfy-combined-face-spec'
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
which *doesn't* clash with CLASS is returned.\n
|
2009-11-19 20:21:01 +00:00
|
|
|
\(A specification with a class of t is considered to match any class you
|
2012-02-28 08:17:21 +00:00
|
|
|
specify - this matches Emacs's behavior when deciding on which face attributes
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
to use, to the best of my understanding).\n
|
2012-01-11 06:53:12 +00:00
|
|
|
If CLASS is nil, then you just get whatever `face-attr-construct' returns,
|
2009-11-19 20:21:01 +00:00
|
|
|
ie the current specification in effect for FACE.\n
|
2015-11-17 23:28:50 +00:00
|
|
|
*NOTE*: This function forces any face that is not `default' and which has
|
|
|
|
no :inherit property to inherit from `default' (this is because `default'
|
2012-02-28 08:17:21 +00:00
|
|
|
is magical in that Emacs's fonts behave as if they inherit implicitly from
|
2015-11-17 23:28:50 +00:00
|
|
|
`default', but no such behavior exists in HTML/CSS).\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-display-class' for details of valid values for CLASS."
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(let ((face-spec
|
|
|
|
(if class
|
|
|
|
(let ((face-props (hfy-combined-face-spec face))
|
|
|
|
(face-specn nil)
|
|
|
|
(face-class nil)
|
|
|
|
(face-attrs nil)
|
|
|
|
(face-score -1)
|
|
|
|
(face-match nil))
|
|
|
|
(while face-props
|
|
|
|
(setq face-specn (car face-props)
|
|
|
|
face-class (car face-specn)
|
|
|
|
face-attrs (cdr face-specn)
|
|
|
|
face-props (cdr face-props))
|
|
|
|
;; if the current element CEL of CLASS is t we match
|
|
|
|
;; if the current face-class is t, we match
|
|
|
|
;; if the cdr of CEL has a non-nil
|
|
|
|
;; intersection with the cdr of the first member of
|
|
|
|
;; the current face-class with the same car as CEL, we match
|
|
|
|
;; if we actually clash, then we can't match
|
|
|
|
(let ((cbuf class)
|
|
|
|
(cel nil)
|
|
|
|
(key nil)
|
|
|
|
(val nil)
|
|
|
|
(x nil)
|
|
|
|
(next nil)
|
|
|
|
(score 0))
|
|
|
|
(while (and cbuf (not next))
|
|
|
|
(setq cel (car cbuf)
|
|
|
|
cbuf (cdr cbuf)
|
|
|
|
key (car cel)
|
|
|
|
val (cdr cel)
|
|
|
|
val (if (listp val) val (list val)))
|
|
|
|
(cond
|
|
|
|
((or (eq cel t)
|
|
|
|
(memq face-class '(t default))) ;Default match.
|
|
|
|
(setq score 0) (ignore "t match"))
|
|
|
|
((not (cdr (assq key face-class))) ;Neither good nor bad.
|
|
|
|
nil (ignore "non match, non collision"))
|
|
|
|
((setq x (hfy-interq val (cdr (assq key face-class))))
|
|
|
|
(setq score (+ score (length x)))
|
|
|
|
(ignore "intersection"))
|
|
|
|
(t ;; nope.
|
|
|
|
(setq next t score -10) (ignore "collision")) ))
|
|
|
|
(if (> score face-score)
|
|
|
|
(progn
|
|
|
|
(setq face-match face-attrs
|
|
|
|
face-score score )
|
|
|
|
(ignore "%d << %S/%S" score face-class class))
|
|
|
|
(ignore "--- %d ---- (insufficient)" score)) ))
|
|
|
|
;; matched ? last attrs : nil
|
|
|
|
(if face-match
|
|
|
|
(if (listp (car face-match)) (car face-match) face-match)
|
|
|
|
nil))
|
|
|
|
;; Unfortunately the default face returns a
|
|
|
|
;; :background. Fortunately we can remove it, but how do we do
|
|
|
|
;; that in a non-system specific way?
|
|
|
|
(let ((spec (face-attr-construct face))
|
|
|
|
(new-spec nil))
|
|
|
|
(if (not (memq :background spec))
|
|
|
|
spec
|
|
|
|
(while spec
|
|
|
|
(let ((a (nth 0 spec))
|
|
|
|
(b (nth 1 spec)))
|
|
|
|
(unless (and (eq a :background)
|
|
|
|
(stringp b)
|
|
|
|
(string= b "SystemWindow"))
|
|
|
|
(setq new-spec (cons a (cons b new-spec)))))
|
|
|
|
(setq spec (cddr spec)))
|
|
|
|
new-spec)))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (or (memq :inherit face-spec) (eq 'default face))
|
|
|
|
face-spec
|
2010-06-27 18:24:42 +00:00
|
|
|
(append face-spec (list :inherit 'default)))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; construct an assoc of (css-tag-name . css-tag-value) pairs
|
|
|
|
;; from a face or assoc of face attributes:
|
|
|
|
|
|
|
|
;; Some tests etc:
|
|
|
|
;; (mumamo-message-with-face "testing face" 'highlight)
|
|
|
|
;; (mumamo-message-with-face "testing face" '(:foreground "red" :background "yellow"))
|
|
|
|
;; (hfy-face-to-style-i '(:inherit default foreground-color "red"))
|
|
|
|
;; default face=(:stipple nil :background "SystemWindow" :foreground
|
|
|
|
;; "SystemWindowText" :inverse-video nil :box nil :strike-through
|
|
|
|
;; nil :overline nil :underline nil :slant normal :weight normal
|
|
|
|
;; :height 98 :width normal :family "outline-courier new")
|
|
|
|
(defun hfy-face-to-style-i (fn)
|
|
|
|
"The guts of `hfy-face-to-style': FN should be a `defface' font spec,
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
as returned by `face-attr-construct' or `hfy-face-attr-for-class'.
|
|
|
|
Note that this function does not get font-sizes right if they are based
|
|
|
|
on inherited modifiers (via the :inherit) attribute, and any other
|
2009-11-19 20:21:01 +00:00
|
|
|
modifiers that are cumulative if they appear multiple times need to be
|
|
|
|
merged by the user - `hfy-flatten-style' should do this."
|
|
|
|
;;(message "hfy-face-to-style-i");;DBUG
|
|
|
|
|
|
|
|
;; fn's value could be something like
|
|
|
|
;; (:inherit
|
|
|
|
;; ((foreground-color . "blue"))
|
|
|
|
;; (foreground-color . "blue")
|
|
|
|
;; nil)
|
|
|
|
|
|
|
|
(when fn
|
|
|
|
(let ((key (car fn))
|
|
|
|
(val (cadr fn))
|
|
|
|
(next (cddr fn))
|
|
|
|
(that nil)
|
|
|
|
(this nil)
|
|
|
|
(parent nil))
|
|
|
|
(if (eq key :inherit)
|
|
|
|
(let ((vs (if (listp val) val (list val))))
|
|
|
|
;; (let ((x '(a b))) (setq x (append '(c d) x)))
|
|
|
|
;; (let ((x '(a b))) (setq x (append '(c d) x)))
|
|
|
|
(dolist (v vs)
|
|
|
|
(setq parent
|
|
|
|
(append
|
|
|
|
parent
|
|
|
|
(hfy-face-to-style-i
|
2016-01-17 22:03:10 +00:00
|
|
|
(hfy-face-attr-for-class v hfy-display-class))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq this
|
2016-11-21 19:50:15 +00:00
|
|
|
(if val (cl-case key
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(:family (hfy-family val))
|
|
|
|
(:width (hfy-width val))
|
|
|
|
(:weight (hfy-weight val))
|
|
|
|
(:slant (hfy-slant val))
|
2018-03-05 01:38:43 +00:00
|
|
|
(:foreground (hfy-color val))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(:background (hfy-bgcol val))
|
|
|
|
(:box (hfy-box val))
|
|
|
|
(:height (hfy-size val))
|
|
|
|
(:underline (hfy-decor key val))
|
|
|
|
(:overline (hfy-decor key val))
|
|
|
|
(:strike-through (hfy-decor key val))
|
|
|
|
(:invisible (hfy-invisible val))
|
|
|
|
(:bold (hfy-weight 'bold))
|
|
|
|
(:italic (hfy-slant 'italic))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq that (hfy-face-to-style-i next))
|
|
|
|
;;(lwarn t :warning "%S => %S" fn (nconc this that parent))
|
2016-01-17 22:03:10 +00:00
|
|
|
(nconc this parent that))) )
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-size-to-int (spec)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Convert SPEC, a CSS font-size specifier, to an Emacs :height attribute value.
|
|
|
|
Used while merging multiple font-size attributes."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-size-to-int");;DBUG
|
|
|
|
(list
|
|
|
|
(if (string-match "\\([0-9]+\\)\\(%\\|pt\\)" spec)
|
|
|
|
(cond ((string= "%" (match-string 2 spec))
|
|
|
|
(/ (string-to-number (match-string 1 spec)) 100.0))
|
|
|
|
((string= "pt" (match-string 2 spec))
|
|
|
|
(* (string-to-number (match-string 1 spec)) 10)))
|
|
|
|
(string-to-number spec))) )
|
|
|
|
|
|
|
|
;; size is different, in that in order to get it right at all,
|
|
|
|
;; we have to trawl the inheritance path, accumulating modifiers,
|
|
|
|
;; _until_ we get to an absolute (pt) specifier, then combine the lot
|
|
|
|
(defun hfy-flatten-style (style)
|
|
|
|
"Take STYLE (see `hfy-face-to-style-i', `hfy-face-to-style') and merge
|
|
|
|
any multiple attributes appropriately. Currently only font-size is merged
|
|
|
|
down to a single occurrence - others may need special handling, but I
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
haven't encountered them yet. Returns a `hfy-style-assoc'."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "(hfy-flatten-style %S)" style) ;;DBUG
|
|
|
|
(let ((n 0)
|
|
|
|
(m (list 1))
|
|
|
|
(x nil)
|
|
|
|
(r nil))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (css style)
|
|
|
|
(if (string= (car css) "font-size")
|
|
|
|
(progn
|
|
|
|
(when (not x) (setq m (nconc m (hfy-size-to-int (cdr css)))))
|
|
|
|
(when (string-match "pt" (cdr css)) (setq x t)))
|
|
|
|
(setq r (nconc r (list css)))))
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "r: %S" r)
|
|
|
|
(setq n (apply '* m))
|
|
|
|
(nconc r (hfy-size (if x (round n) (* n 1.0)))) ))
|
|
|
|
|
2010-05-27 15:28:58 +00:00
|
|
|
(defun hfy-face-resolve-face (fn)
|
2016-01-17 22:03:10 +00:00
|
|
|
"For FN return a face specification.
|
|
|
|
FN may be either a face or a face specification. If the latter,
|
|
|
|
then the specification is returned unchanged."
|
2010-05-27 15:28:58 +00:00
|
|
|
(cond
|
|
|
|
((facep fn)
|
|
|
|
(hfy-face-attr-for-class fn hfy-display-class))
|
2016-01-17 22:03:10 +00:00
|
|
|
;; FIXME: is this necessary? Faces can be symbols, but
|
|
|
|
;; not symbols refering to other symbols?
|
2010-05-27 15:28:58 +00:00
|
|
|
((and (symbolp fn)
|
2012-03-17 14:03:54 +00:00
|
|
|
(facep (symbol-value fn)))
|
2016-01-17 22:03:10 +00:00
|
|
|
(hfy-face-attr-for-class
|
|
|
|
(symbol-value fn) hfy-display-class))
|
|
|
|
(t fn)))
|
2010-05-27 15:28:58 +00:00
|
|
|
|
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-face-to-style (fn)
|
|
|
|
"Take FN, a font or `defface' style font specification,
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(as returned by `face-attr-construct' or `hfy-face-attr-for-class')
|
2009-11-19 20:21:01 +00:00
|
|
|
and return a `hfy-style-assoc'.\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-face-to-style-i', `hfy-flatten-style'."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-face-to-style");;DBUG
|
2011-01-27 17:04:07 +00:00
|
|
|
(let* ((face-def (hfy-face-resolve-face fn))
|
|
|
|
(final-style
|
|
|
|
(hfy-flatten-style (hfy-face-to-style-i face-def))))
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "%S" final-style)
|
|
|
|
(if (not (assoc "text-decoration" final-style))
|
|
|
|
(progn (setq final-style
|
|
|
|
;; Fix-me: there is no need for this since
|
|
|
|
;; text-decoration is not inherited.
|
|
|
|
;; but it's not wrong and if this ever changes it will
|
|
|
|
;; be needed, so I think it's better to leave it in? -- v
|
2011-11-30 16:33:05 +00:00
|
|
|
(nconc final-style '(("text-decoration" . "none"))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
final-style))
|
|
|
|
|
|
|
|
;; strip redundant bits from a name. Technically, this could result in
|
|
|
|
;; a collision, but it is pretty unlikely - will fix later...
|
|
|
|
;; also handle ephemeral fonts created by overlays, which don't actually
|
|
|
|
;; have names:
|
|
|
|
(defun hfy-face-or-def-to-name (fn)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Render a font symbol or `defface' font spec FN into a name (string)."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "generating name for %s" fn)
|
|
|
|
(if (not (listp fn))
|
|
|
|
(format "%s" fn)
|
|
|
|
(let* ((key (format "%s" fn))
|
|
|
|
(entry (assoc key hfy-tmpfont-stack))
|
|
|
|
(base (cadr (memq :inherit fn)))
|
|
|
|
(tag (cdr entry)))
|
|
|
|
;;(message "checking for key «%s» in font stack [%d]"
|
|
|
|
;; key (if entry 1 0))
|
|
|
|
(if entry nil ;; noop
|
|
|
|
(setq tag (format "%04d" (length hfy-tmpfont-stack))
|
|
|
|
entry (cons key tag)
|
|
|
|
hfy-tmpfont-stack (cons entry hfy-tmpfont-stack)))
|
|
|
|
;;(message " -> name: %s-%s" (or base 'default) tag)
|
|
|
|
(format "%s-%s" (or base 'default) tag)) ))
|
|
|
|
|
|
|
|
(defun hfy-css-name (fn)
|
|
|
|
"Strip the boring bits from a font-name FN and return a CSS style name."
|
|
|
|
;;(message "hfy-css-name");;DBUG
|
|
|
|
(let ((face-name (hfy-face-or-def-to-name fn)))
|
|
|
|
(if (or (string-match "font-lock-\\(.*\\)" face-name)
|
|
|
|
(string-match "cperl-\\(.*\\)" face-name)
|
|
|
|
(string-match "^[Ii]nfo-\\(.*\\)" face-name))
|
|
|
|
(progn
|
|
|
|
(setq face-name (match-string 1 face-name))
|
2011-01-27 17:04:07 +00:00
|
|
|
(if (string-match "\\(.*\\)-face\\'" face-name)
|
|
|
|
(setq face-name (match-string 1 face-name)))
|
|
|
|
face-name)
|
2009-11-19 20:21:01 +00:00
|
|
|
face-name)) )
|
|
|
|
|
|
|
|
;; construct an assoc of (stripped-name . "{ css-stuff-here }") pairs
|
|
|
|
;; from a face:
|
2012-03-17 14:03:54 +00:00
|
|
|
(defun hfy-face-to-css-default (fn)
|
|
|
|
"Default handler for mapping faces to styles.
|
|
|
|
See also `hfy-face-to-css'."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-face-to-css");;DBUG
|
2011-01-27 17:04:07 +00:00
|
|
|
(let* ((css-list (hfy-face-to-style fn))
|
|
|
|
(seen nil)
|
|
|
|
(css-text
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (E)
|
|
|
|
(if (car E)
|
|
|
|
(unless (member (car E) seen)
|
|
|
|
(push (car E) seen)
|
|
|
|
(format " %s: %s; " (car E) (cdr E)))))
|
2011-01-27 17:04:07 +00:00
|
|
|
css-list)))
|
2009-11-19 20:21:01 +00:00
|
|
|
(cons (hfy-css-name fn) (format "{%s}" (apply 'concat css-text)))) )
|
|
|
|
|
2012-03-17 14:03:54 +00:00
|
|
|
(defvar hfy-face-to-css 'hfy-face-to-css-default
|
|
|
|
"Handler for mapping faces to styles.
|
2015-09-17 23:08:20 +00:00
|
|
|
The signature of the handler is of the form \(lambda (FN) ...).
|
2012-03-17 14:03:54 +00:00
|
|
|
FN is a font or `defface' specification (cf
|
|
|
|
`face-attr-construct'). The handler should return a cons cell of
|
|
|
|
the form (STYLE-NAME . STYLE-SPEC).
|
|
|
|
|
|
|
|
The default handler is `hfy-face-to-css-default'.
|
|
|
|
|
|
|
|
See also `hfy-face-to-style'.")
|
|
|
|
|
2011-01-27 17:04:07 +00:00
|
|
|
(defalias 'hfy-prop-invisible-p
|
|
|
|
(if (fboundp 'invisible-p) #'invisible-p
|
|
|
|
(lambda (prop)
|
|
|
|
"Is text property PROP an active invisibility property?"
|
|
|
|
(or (and (eq buffer-invisibility-spec t) prop)
|
|
|
|
(or (memq prop buffer-invisibility-spec)
|
|
|
|
(assq prop buffer-invisibility-spec))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-find-invisible-ranges ()
|
|
|
|
"Return a list of (start-point . end-point) cons cells of invisible regions."
|
2011-01-27 17:04:07 +00:00
|
|
|
(save-excursion
|
|
|
|
(let (invisible p i s) ;; return-value pos invisible end start
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq p (goto-char (point-min)))
|
|
|
|
(when (invisible-p p) (setq s p i t))
|
|
|
|
(while (< p (point-max))
|
|
|
|
(if i ;; currently invisible
|
|
|
|
(when (not (invisible-p p)) ;; but became visible
|
2011-01-27 17:04:07 +00:00
|
|
|
(setq i nil
|
|
|
|
invisible (cons (cons s p) invisible)))
|
2009-11-19 20:21:01 +00:00
|
|
|
;; currently visible:
|
|
|
|
(when (invisible-p p) ;; but have become invisible
|
|
|
|
(setq s p i t)))
|
|
|
|
(setq p (next-char-property-change p)))
|
|
|
|
;; still invisible at buffer end?
|
|
|
|
(when i
|
2011-04-19 13:44:55 +00:00
|
|
|
(setq invisible (cons (cons s (point-max)) invisible)))
|
2011-01-27 17:04:07 +00:00
|
|
|
invisible)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-invisible-name (point map)
|
|
|
|
"Generate a CSS style name for an invisible section of the buffer.
|
|
|
|
POINT is the point inside the invisible region.
|
|
|
|
MAP is the invisibility map as returned by `hfy-find-invisible-ranges'."
|
|
|
|
;;(message "(hfy-invisible-name %S %S)" point map)
|
|
|
|
(let (name)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (range map)
|
|
|
|
(when (and (>= point (car range))
|
|
|
|
(< point (cdr range)))
|
|
|
|
(setq name (format "invisible-%S-%S" (car range) (cdr range)))))
|
2009-11-19 20:21:01 +00:00
|
|
|
name))
|
|
|
|
|
|
|
|
;; Fix-me: This function needs some cleanup by someone who understand
|
|
|
|
;; all the formats that face properties can have.
|
|
|
|
;;
|
|
|
|
;; overlay handling should be fine. haven't tested multiple stacked overlapping
|
|
|
|
;; overlays recently, but the common case of a text property face + an overlay
|
|
|
|
;; face produces the correct merged css style (or as close to it as css can get)
|
|
|
|
;; -- v
|
|
|
|
(defun hfy-face-at (p)
|
|
|
|
"Find face in effect at point P.
|
2015-04-06 06:40:54 +00:00
|
|
|
If overlays are to be considered (see `hfy-optimizations') then this may
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
return a `defface' style list of face properties instead of a face symbol."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-face-at");;DBUG
|
|
|
|
;; Fix-me: clean up, remove face-name etc
|
|
|
|
;; not sure why we'd want to remove face-name? -- v
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(let ((overlay-data nil)
|
|
|
|
(base-face nil)
|
2011-01-27 17:04:07 +00:00
|
|
|
(face-name (get-text-property p 'face))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
;; (face-name (hfy-get-face-at p))
|
|
|
|
(prop-seen nil)
|
|
|
|
(extra-props nil)
|
|
|
|
(text-props (text-properties-at p)))
|
|
|
|
;;(message "face-name: %S" face-name)
|
|
|
|
(when (and face-name (listp face-name) (facep (car face-name)))
|
|
|
|
;;(message "face-name is a list %S" face-name)
|
|
|
|
;;(setq text-props (cons 'face face-name))
|
|
|
|
(dolist (f face-name)
|
|
|
|
(setq extra-props (if (listp f)
|
|
|
|
;; for things like (variable-pitch
|
|
|
|
;; (:foreground "red"))
|
|
|
|
(cons f extra-props)
|
|
|
|
(cons :inherit (cons f extra-props)))))
|
|
|
|
(setq base-face (car face-name)
|
|
|
|
face-name nil))
|
|
|
|
;; text-properties-at => (face (:foreground "red" ...))
|
|
|
|
;; or => (face (compilation-info underline)) list of faces
|
|
|
|
;; overlay-properties
|
|
|
|
;; format= (evaporate t face ((foreground-color . "red")))
|
|
|
|
|
|
|
|
;; SO: if we have turned overlays off,
|
|
|
|
;; or if there's no overlay data
|
|
|
|
;; just bail out and return whatever face data we've accumulated so far
|
|
|
|
(if (or (not (hfy-opt 'keep-overlays))
|
|
|
|
(not (setq overlay-data (hfy-overlay-props-at p))))
|
|
|
|
(progn
|
|
|
|
;;(message "· %d: %s; %S; %s"
|
|
|
|
;; p face-name extra-props text-props)
|
|
|
|
(or face-name base-face)) ;; no overlays or extra properties
|
|
|
|
;; collect any face data and any overlay data for processing:
|
|
|
|
(when text-props
|
|
|
|
(push text-props overlay-data))
|
|
|
|
(setq overlay-data (nreverse overlay-data))
|
|
|
|
;;(message "- %d: %s; %S; %s; %s"
|
|
|
|
;; p face-name extra-props text-props overlay-data)
|
|
|
|
;; remember the basic face name so we don't keep repeating its specs:
|
|
|
|
(when face-name (setq base-face face-name))
|
|
|
|
(dolist (P overlay-data)
|
|
|
|
(let ((iprops (cadr (memq 'invisible P)))) ;FIXME: plist-get?
|
|
|
|
;;(message "(hfy-prop-invisible-p %S)" iprops)
|
|
|
|
(when (and iprops (hfy-prop-invisible-p iprops))
|
|
|
|
(setq extra-props
|
|
|
|
(cons :invisible (cons t extra-props))) ))
|
|
|
|
(let ((fprops (cadr (or (memq 'face P)
|
|
|
|
(memq 'font-lock-face P)))))
|
|
|
|
;;(message "overlay face: %s" fprops)
|
|
|
|
(if (not (listp fprops))
|
|
|
|
(let ((this-face (if (stringp fprops) (intern fprops) fprops)))
|
|
|
|
(when (not (eq this-face base-face))
|
|
|
|
(setq extra-props
|
|
|
|
(cons :inherit
|
|
|
|
(cons this-face extra-props))) ))
|
|
|
|
(while fprops
|
|
|
|
(if (facep (car fprops))
|
|
|
|
(let ((face (car fprops)))
|
|
|
|
(when (stringp face) (setq face (intern fprops)))
|
|
|
|
(setq extra-props
|
|
|
|
(cons :inherit
|
|
|
|
(cons face
|
|
|
|
extra-props)))
|
|
|
|
(setq fprops (cdr fprops)))
|
|
|
|
(let (p v)
|
|
|
|
;; Sigh.
|
|
|
|
(if (listp (car fprops))
|
|
|
|
(if (nlistp (cdr (car fprops)))
|
|
|
|
(progn
|
|
|
|
;; ((prop . val))
|
|
|
|
(setq p (caar fprops))
|
|
|
|
(setq v (cdar fprops))
|
|
|
|
(setq fprops (cdr fprops)))
|
|
|
|
;; ((prop val))
|
|
|
|
(setq p (caar fprops))
|
2016-11-21 19:50:15 +00:00
|
|
|
(setq v (cl-cadar fprops))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(setq fprops (cdr fprops)))
|
|
|
|
(if (listp (cdr fprops))
|
|
|
|
(progn
|
|
|
|
;; (:prop val :prop val ...)
|
|
|
|
(setq p (car fprops))
|
|
|
|
(setq v (cadr fprops))
|
|
|
|
(setq fprops (cddr fprops)))
|
|
|
|
(if (and (listp fprops)
|
|
|
|
(not (listp (cdr fprops))))
|
|
|
|
;;(and (consp x) (cdr (last x)))
|
|
|
|
(progn
|
|
|
|
;; (prop . val)
|
|
|
|
(setq p (car fprops))
|
|
|
|
(setq v (cdr fprops))
|
|
|
|
(setq fprops nil))
|
|
|
|
(error "Eh... another format! fprops=%s" fprops) )))
|
2016-11-21 19:50:15 +00:00
|
|
|
(setq p (cl-case p
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
;; These are all the properties handled
|
|
|
|
;; in `hfy-face-to-style-i'.
|
|
|
|
;;
|
|
|
|
;; Are these translations right?
|
|
|
|
;; yes, they are -- v
|
|
|
|
(family :family )
|
|
|
|
(width :width )
|
|
|
|
(height :height )
|
|
|
|
(weight :weight )
|
|
|
|
(slant :slant )
|
|
|
|
(underline :underline )
|
|
|
|
(overline :overline )
|
|
|
|
(strike-through :strike-through)
|
|
|
|
(box :box )
|
|
|
|
(foreground-color :foreground)
|
|
|
|
(background-color :background)
|
|
|
|
(bold :bold )
|
|
|
|
(italic :italic )
|
|
|
|
(t p)))
|
|
|
|
(if (memq p prop-seen) nil ;; noop
|
|
|
|
(setq prop-seen (cons p prop-seen)
|
|
|
|
extra-props (cons p (cons v extra-props))))))))))
|
|
|
|
;;(message "+ %d: %s; %S" p face-name extra-props)
|
|
|
|
(if extra-props
|
2011-01-27 17:04:07 +00:00
|
|
|
(nconc extra-props (if (listp face-name)
|
|
|
|
face-name
|
|
|
|
(face-attr-construct face-name)))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
face-name)) ))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-overlay-props-at (p)
|
|
|
|
"Grab overlay properties at point P.
|
|
|
|
The plists are returned in descending priority order."
|
2014-04-15 13:21:18 +00:00
|
|
|
(mapcar #'overlay-properties (overlays-at p 'sorted)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; construct an assoc of (face-name . (css-name . "{ css-style }")) elements:
|
|
|
|
(defun hfy-compile-stylesheet ()
|
2012-03-17 14:03:54 +00:00
|
|
|
"Trawl the current buffer, construct and return a `hfy-sheet-assoc'.
|
|
|
|
If `hfy-user-sheet-assoc' is currently bound then use it to
|
|
|
|
collect new styles discovered during this run. Otherwise create
|
|
|
|
a new assoc."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-compile-stylesheet");;DBUG
|
|
|
|
(let ((pt (point-min))
|
|
|
|
;; Make the font stack stay:
|
|
|
|
;;(hfy-tmpfont-stack nil)
|
|
|
|
(fn nil)
|
2012-03-17 14:03:54 +00:00
|
|
|
(style (and (boundp 'hfy-user-sheet-assoc) hfy-user-sheet-assoc)))
|
2009-11-19 20:21:01 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char pt)
|
|
|
|
(while (< pt (point-max))
|
|
|
|
(if (and (setq fn (hfy-face-at pt)) (not (assoc fn style)))
|
2012-03-17 14:03:54 +00:00
|
|
|
(push (cons fn (funcall hfy-face-to-css fn)) style))
|
|
|
|
(setq pt (next-char-property-change pt))))
|
|
|
|
(unless (assoc 'default style)
|
|
|
|
(push (cons 'default (funcall hfy-face-to-css 'default)) style))
|
|
|
|
(when (boundp 'hfy-user-sheet-assoc)
|
|
|
|
(setq hfy-user-sheet-assoc style))
|
|
|
|
style))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-fontified-p ()
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"`font-lock' doesn't like to say it's been fontified when in batch
|
2009-11-19 20:21:01 +00:00
|
|
|
mode, but we want to know if we should fontify or raw copy, so in batch
|
|
|
|
mode we check for non-default face properties. Otherwise we test
|
|
|
|
variable `font-lock-mode' and variable `font-lock-fontified' for truth."
|
|
|
|
;;(message "font-lock-fontified: %S" font-lock-fontified)
|
|
|
|
;;(message "noninteractive : %S" noninteractive)
|
|
|
|
;;(message "font-lock-mode : %S" font-lock-mode)
|
|
|
|
(and font-lock-fontified
|
|
|
|
(if noninteractive
|
|
|
|
(let ((pt (point-min))
|
|
|
|
(face-name nil))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char pt)
|
|
|
|
(while (and (< pt (point-max)) (not face-name))
|
|
|
|
(setq face-name (hfy-face-at pt))
|
2011-01-27 17:04:07 +00:00
|
|
|
(setq pt (next-char-property-change pt))))
|
|
|
|
face-name)
|
2009-11-19 20:21:01 +00:00
|
|
|
font-lock-mode)))
|
|
|
|
|
|
|
|
;; remember, the map is in reverse point order:
|
|
|
|
;; I wrote this while suffering the effects of a cold, and maybe a
|
|
|
|
;; mild fever - I think it's correct, but it might be a little warped
|
|
|
|
;; as my minfd keeps ... where was I? Oh yes, the bunnies...
|
|
|
|
(defun hfy-merge-adjacent-spans (face-map)
|
|
|
|
"Where FACE-MAP is a `hfy-facemap-assoc' for the current buffer,
|
|
|
|
this function merges adjacent style blocks which are of the same value
|
|
|
|
and are separated by nothing more interesting than whitespace.\n
|
|
|
|
<span class=\"foo\">narf</span> <span class=\"foo\">brain</span>\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
\(as interpreted from FACE-MAP) would become:\n
|
2009-11-19 20:21:01 +00:00
|
|
|
<span class=\"foo\">narf brain</span>\n
|
|
|
|
Returns a modified copy of FACE-MAP."
|
|
|
|
(let ((tmp-map face-map)
|
|
|
|
(map-buf nil)
|
|
|
|
(first-start nil)
|
|
|
|
(first-stop nil)
|
|
|
|
(last-start nil)
|
|
|
|
(last-stop nil)
|
|
|
|
(span-stop nil)
|
|
|
|
(span-start nil)
|
|
|
|
(reduced-map nil))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
;;(push (car tmp-map) reduced-map)
|
|
|
|
;;(push (cadr tmp-map) reduced-map)
|
2009-11-19 20:21:01 +00:00
|
|
|
(while tmp-map
|
2016-11-21 19:50:15 +00:00
|
|
|
(setq first-start (cl-cadddr tmp-map)
|
|
|
|
first-stop (cl-caddr tmp-map)
|
2009-11-19 20:21:01 +00:00
|
|
|
last-start (cadr tmp-map)
|
|
|
|
last-stop (car tmp-map)
|
|
|
|
map-buf tmp-map
|
|
|
|
span-start last-start
|
|
|
|
span-stop last-stop )
|
|
|
|
(while (and (equal (cdr first-start)
|
|
|
|
(cdr last-start))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (car first-stop))
|
|
|
|
(not (re-search-forward "[^ \t\n\r]" (car last-start) t))))
|
|
|
|
(setq map-buf (cddr map-buf)
|
|
|
|
span-start first-start
|
2016-11-21 19:50:15 +00:00
|
|
|
first-start (cl-cadddr map-buf)
|
|
|
|
first-stop (cl-caddr map-buf)
|
2009-11-19 20:21:01 +00:00
|
|
|
last-start (cadr map-buf)
|
|
|
|
last-stop (car map-buf)))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(push span-stop reduced-map)
|
|
|
|
(push span-start reduced-map)
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq tmp-map (memq last-start tmp-map))
|
|
|
|
(setq tmp-map (cdr tmp-map)))
|
|
|
|
(setq reduced-map (nreverse reduced-map))))
|
|
|
|
|
|
|
|
;; remember to generate 'synthetic' </span> entries -
|
|
|
|
;; emacs copes by just having a stack of styles in effect
|
|
|
|
;; and only using the top one: html has a more simplistic approach -
|
|
|
|
;; we have to explicitly end a style, there's no way of temporarily
|
|
|
|
;; overriding it w. another one... (afaik)
|
|
|
|
(defun hfy-compile-face-map ()
|
|
|
|
;; no need for special <a> version.
|
|
|
|
;; IME hyperlinks don't get underlined, esp when you htmlfontify a whole
|
|
|
|
;; source tree, so the <a> version is needed -- v
|
|
|
|
;; Fix-me: save table for multi-buffer
|
|
|
|
"Compile and return a `hfy-facemap-assoc' for the current buffer."
|
|
|
|
;;(message "hfy-compile-face-map");;DBUG
|
2011-01-27 17:04:07 +00:00
|
|
|
(let* ((pt (point-min))
|
|
|
|
(pt-narrow (save-restriction (widen) (point-min)))
|
|
|
|
(offset (- pt pt-narrow))
|
|
|
|
(fn nil)
|
|
|
|
(map nil)
|
|
|
|
(prev-tag nil)) ;; t if the last tag-point was a span-start
|
|
|
|
;; nil if it was a span-stop
|
2009-11-19 20:21:01 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char pt)
|
|
|
|
(while (< pt (point-max))
|
|
|
|
(if (setq fn (hfy-face-at pt))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(progn (if prev-tag (push (cons pt-narrow 'end) map))
|
|
|
|
(push (cons pt-narrow fn) map)
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq prev-tag t))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(if prev-tag (push (cons pt-narrow 'end) map))
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq prev-tag nil))
|
|
|
|
(setq pt (next-char-property-change pt))
|
2011-01-27 17:04:07 +00:00
|
|
|
(setq pt-narrow (+ offset pt)))
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (and map (not (eq 'end (cdar map))))
|
2012-03-17 14:03:54 +00:00
|
|
|
(push (cons (1+ (- (point-max) (point-min))) 'end) map)))
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (hfy-opt 'merge-adjacent-tags) (hfy-merge-adjacent-spans map) map)))
|
|
|
|
|
|
|
|
(defun hfy-buffer ()
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Generate a buffer to hold the HTML output.
|
|
|
|
The filename of this buffer is derived from the source (current) buffer's
|
2009-11-19 20:21:01 +00:00
|
|
|
variable `buffer-file-name', if it is set, plus `hfy-extn'.
|
|
|
|
Otherwise a plausible filename is constructed from `default-directory',
|
|
|
|
`buffer-name' and `hfy-extn'."
|
|
|
|
(let* ((name (concat (buffer-name) hfy-extn))
|
|
|
|
(src (buffer-file-name))
|
|
|
|
(buf (get-buffer-create name)))
|
2009-11-19 20:47:40 +00:00
|
|
|
(with-current-buffer buf
|
|
|
|
(setq buffer-file-name
|
|
|
|
(if src (concat src hfy-extn)
|
2011-01-27 17:04:07 +00:00
|
|
|
(expand-file-name (if (string-match "^.*/\\([^/]*\\)\\'" name)
|
2009-11-19 20:47:40 +00:00
|
|
|
(match-string 1 name)
|
|
|
|
name))))
|
2009-11-19 20:21:01 +00:00
|
|
|
buf)))
|
|
|
|
|
|
|
|
(defun hfy-lookup (face style)
|
|
|
|
"Get a CSS style name for FACE from STYLE."
|
|
|
|
(cadr (assoc face style)))
|
|
|
|
|
|
|
|
(defun hfy-link-style (style-string)
|
|
|
|
"Copy, alter and return a STYLE-STRING to make it suitable for a hyperlink.
|
|
|
|
Uses `hfy-link-style-fun' to do this."
|
|
|
|
(if (functionp hfy-link-style-fun)
|
|
|
|
(funcall hfy-link-style-fun style-string)
|
|
|
|
style-string))
|
|
|
|
|
|
|
|
(defun hfy-sprintf-stylesheet (css file)
|
|
|
|
"Return the inline CSS style sheet for FILE as a string."
|
2011-01-27 17:04:07 +00:00
|
|
|
(let ((stylesheet
|
|
|
|
(concat
|
|
|
|
hfy-meta-tags
|
|
|
|
"\n<style type=\"text/css\"><!-- \n"
|
|
|
|
;; Fix-me: Add handling of page breaks here + scan for ^L
|
|
|
|
;; where appropriate.
|
|
|
|
(format "body %s\n" (cddr (assq 'default css)))
|
|
|
|
(apply 'concat
|
|
|
|
(mapcar
|
|
|
|
(lambda (style)
|
|
|
|
(format
|
|
|
|
"span.%s %s\nspan.%s a %s\n"
|
|
|
|
(cadr style) (cddr style)
|
|
|
|
(cadr style) (hfy-link-style (cddr style))))
|
|
|
|
css))
|
|
|
|
" --></style>\n")))
|
2009-11-19 20:21:01 +00:00
|
|
|
(funcall hfy-page-header file stylesheet)))
|
|
|
|
|
|
|
|
;; tag all the dangerous characters we want to escape
|
|
|
|
;; (ie any "<> chars we _didn't_ put there explicitly for css markup)
|
|
|
|
(defun hfy-html-enkludge-buffer ()
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Mark dangerous [\"<>] characters with the `hfy-quoteme' property.\n
|
2009-11-19 20:21:01 +00:00
|
|
|
See also `hfy-html-dekludge-buffer'."
|
|
|
|
;;(message "hfy-html-enkludge-buffer");;DBUG
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward hfy-html-quote-regex nil t)
|
|
|
|
(put-text-property (match-beginning 0) (point) 'hfy-quoteme t))) )
|
|
|
|
|
|
|
|
;; dangerous char -> &entity;
|
|
|
|
(defun hfy-html-quote (char-string)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Map CHAR-STRING to an HTML safe string (entity) if need be."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-html-quote");;DBUG
|
|
|
|
(or (cadr (assoc char-string hfy-html-quote-map)) char-string) )
|
|
|
|
|
|
|
|
;; actually entity-ise dangerous chars.
|
|
|
|
;; note that we can't do this until _after_ we have inserted the css
|
|
|
|
;; markup, since we use a position-based map to insert this, and if we
|
|
|
|
;; enter any other text before we do this, we'd have to track another
|
|
|
|
;; map of offsets, which would be tedious...
|
|
|
|
(defun hfy-html-dekludge-buffer ()
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Transform all dangerous characters marked with the `hfy-quoteme' property
|
|
|
|
using `hfy-html-quote'.\n
|
2009-11-19 20:21:01 +00:00
|
|
|
See also `hfy-html-enkludge-buffer'."
|
|
|
|
;;(message "hfy-html-dekludge-buffer");;DBUG
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward hfy-html-quote-regex nil t)
|
|
|
|
(if (get-text-property (match-beginning 0) 'hfy-quoteme)
|
|
|
|
(replace-match (hfy-html-quote (match-string 1))) )) ))
|
|
|
|
|
|
|
|
;; Borrowed from font-lock.el
|
|
|
|
(defmacro hfy-save-buffer-state (varlist &rest body)
|
|
|
|
"Bind variables according to VARLIST and eval BODY restoring buffer state.
|
|
|
|
Do not record undo information during evaluation of BODY."
|
|
|
|
(declare (indent 1) (debug let))
|
|
|
|
(let ((modified (make-symbol "modified")))
|
|
|
|
`(let* ,(append varlist
|
|
|
|
`((,modified (buffer-modified-p))
|
|
|
|
(buffer-undo-list t)
|
|
|
|
(inhibit-read-only t)
|
|
|
|
(inhibit-point-motion-hooks t)
|
|
|
|
(inhibit-modification-hooks t)
|
|
|
|
deactivate-mark
|
|
|
|
buffer-file-name
|
|
|
|
buffer-file-truename))
|
|
|
|
(progn
|
|
|
|
,@body)
|
|
|
|
(unless ,modified
|
|
|
|
(restore-buffer-modified-p nil)))))
|
|
|
|
|
|
|
|
(defun hfy-mark-trailing-whitespace ()
|
|
|
|
"Tag trailing whitespace with a hfy property if it is currently highlighted."
|
|
|
|
(when show-trailing-whitespace
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(hfy-save-buffer-state nil
|
|
|
|
(while (re-search-forward "[ \t]+$" nil t)
|
|
|
|
(put-text-property (match-beginning 0) (match-end 0)
|
|
|
|
'hfy-show-trailing-whitespace t)))))))
|
|
|
|
|
|
|
|
(defun hfy-unmark-trailing-whitespace ()
|
|
|
|
"Undo the effect of `hfy-mark-trailing-whitespace'."
|
|
|
|
(when show-trailing-whitespace
|
|
|
|
(hfy-save-buffer-state nil
|
|
|
|
(remove-text-properties (point-min) (point-max)
|
|
|
|
'(hfy-show-trailing-whitespace)))))
|
|
|
|
|
2012-03-17 14:03:54 +00:00
|
|
|
(defun hfy-begin-span (style text-block text-id text-begins-block-p)
|
|
|
|
"Default handler to begin a span of text.
|
|
|
|
Insert \"<span class=\"STYLE\" ...>\". See
|
|
|
|
`hfy-begin-span-handler' for more information."
|
|
|
|
(when text-begins-block-p
|
|
|
|
(insert
|
|
|
|
(format "<span onclick=\"toggle_invis('%s');\">…</span>" text-block)))
|
|
|
|
|
|
|
|
(insert
|
|
|
|
(if text-block
|
|
|
|
(format "<span class=\"%s\" id=\"%s-%d\">" style text-block text-id)
|
|
|
|
(format "<span class=\"%s\">" style))))
|
|
|
|
|
|
|
|
(defun hfy-end-span ()
|
|
|
|
"Default handler to end a span of text.
|
|
|
|
Insert \"</span>\". See `hfy-end-span-handler' for more
|
|
|
|
information."
|
|
|
|
(insert "</span>"))
|
|
|
|
|
|
|
|
(defvar hfy-begin-span-handler 'hfy-begin-span
|
|
|
|
"Handler to begin a span of text.
|
|
|
|
The signature of the handler is \(lambda (STYLE TEXT-BLOCK
|
2015-09-17 23:08:20 +00:00
|
|
|
TEXT-ID TEXT-BEGINS-BLOCK-P) ...). The handler must insert
|
2012-03-17 14:03:54 +00:00
|
|
|
appropriate tags to begin a span of text.
|
|
|
|
|
|
|
|
STYLE is the name of the style that begins at point. It is
|
|
|
|
derived from the face attributes as part of `hfy-face-to-css'
|
|
|
|
callback. The other arguments TEXT-BLOCK, TEXT-ID,
|
|
|
|
TEXT-BEGINS-BLOCK-P are non-nil only if the buffer contains
|
|
|
|
invisible text.
|
|
|
|
|
|
|
|
TEXT-BLOCK is a string that identifies a single chunk of visible
|
|
|
|
or invisible text of which the current position is a part. For
|
2018-03-26 20:12:51 +00:00
|
|
|
visible portions, its value is \"nil\". For invisible portions,
|
|
|
|
its value is computed as part of `hfy-invisible-name'.
|
2012-03-17 14:03:54 +00:00
|
|
|
|
|
|
|
TEXT-ID marks a unique position within a block. It is set to
|
|
|
|
value of `point' at the current buffer position.
|
|
|
|
|
|
|
|
TEXT-BEGINS-BLOCK-P is a boolean and is non-nil if the current
|
2018-02-16 20:16:15 +00:00
|
|
|
span also begins an invisible portion of text.
|
2012-03-17 14:03:54 +00:00
|
|
|
|
|
|
|
An implementation can use TEXT-BLOCK, TEXT-ID,
|
|
|
|
TEXT-BEGINS-BLOCK-P to implement fold/unfold-on-mouse-click like
|
2014-01-05 02:56:08 +00:00
|
|
|
behavior.
|
2012-03-17 14:03:54 +00:00
|
|
|
|
|
|
|
The default handler is `hfy-begin-span'.")
|
|
|
|
|
|
|
|
(defvar hfy-end-span-handler 'hfy-end-span
|
|
|
|
"Handler to end a span of text.
|
2015-09-17 23:08:20 +00:00
|
|
|
The signature of the handler is \(lambda () ...). The handler
|
2012-03-17 14:03:54 +00:00
|
|
|
must insert appropriate tags to end a span of text.
|
|
|
|
|
|
|
|
The default handler is `hfy-end-span'.")
|
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-fontify-buffer (&optional srcdir file)
|
|
|
|
"Implement the guts of `htmlfontify-buffer'.
|
|
|
|
SRCDIR, if set, is the directory being htmlfontified.
|
|
|
|
FILE, if set, is the file name."
|
|
|
|
(if srcdir (setq srcdir (directory-file-name srcdir)))
|
2019-06-23 18:10:21 +00:00
|
|
|
(let* ( (inhibit-read-only t)
|
|
|
|
(html-buffer (hfy-buffer))
|
2009-11-19 20:21:01 +00:00
|
|
|
(css-sheet nil)
|
|
|
|
(css-map nil)
|
|
|
|
(invis-ranges nil)
|
|
|
|
(rovl nil)
|
|
|
|
(rmin (when mark-active (region-beginning)))
|
|
|
|
(rmax (when mark-active (region-end ))) )
|
|
|
|
(when (and mark-active
|
|
|
|
transient-mark-mode)
|
|
|
|
(unless (and (= rmin (point-min))
|
|
|
|
(= rmax (point-max)))
|
|
|
|
(setq rovl (make-overlay rmin rmax))
|
|
|
|
(overlay-put rovl 'priority 1000)
|
|
|
|
(overlay-put rovl 'face 'region)))
|
|
|
|
;; copy the buffer, including fontification, and switch to it:
|
|
|
|
(hfy-mark-trailing-whitespace)
|
|
|
|
(setq css-sheet (hfy-compile-stylesheet )
|
|
|
|
css-map (hfy-compile-face-map )
|
|
|
|
invis-ranges (hfy-find-invisible-ranges))
|
|
|
|
(hfy-unmark-trailing-whitespace)
|
|
|
|
(when rovl
|
|
|
|
(delete-overlay rovl))
|
|
|
|
(copy-to-buffer html-buffer (point-min) (point-max))
|
|
|
|
(set-buffer html-buffer)
|
2011-11-20 02:29:42 +00:00
|
|
|
;; rip out props that could interfere with our htmlization of the buffer:
|
2009-12-09 05:56:53 +00:00
|
|
|
(remove-text-properties (point-min) (point-max) hfy-ignored-properties)
|
2009-11-19 20:21:01 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;; at this point, html-buffer retains the fontification of the parent:
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;; we don't really need or want text in the html buffer to be invisible, as
|
|
|
|
;; that can make it look like we've rendered invalid xhtml when all that's
|
|
|
|
;; happened is some tags are in the invisible portions of the buffer:
|
|
|
|
(setq buffer-invisibility-spec nil)
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;; #####################################################################
|
|
|
|
;; if we are in etags mode, add properties to mark the anchors and links
|
|
|
|
(if (and srcdir file)
|
|
|
|
(progn
|
|
|
|
(hfy-mark-tag-names srcdir file) ;; mark anchors
|
|
|
|
(hfy-mark-tag-hrefs srcdir file))) ;; mark links
|
|
|
|
;; #####################################################################
|
|
|
|
;; mark the 'dangerous' characters
|
|
|
|
;;(message "marking dangerous characters")
|
|
|
|
(hfy-html-enkludge-buffer)
|
|
|
|
;; trawl the position-based face-map, inserting span tags as we go
|
|
|
|
;; note that we cannot change any character positions before this point
|
|
|
|
;; or we will invalidate the map:
|
|
|
|
;; NB: This also means we have to trawl the map in descending file-offset
|
|
|
|
;; order, obviously.
|
|
|
|
;; ---------------------------------------------------------------------
|
|
|
|
;; Remember, inserting pushes properties to the right, which we don't
|
|
|
|
;; actually want to happen for link properties, so we have to flag
|
|
|
|
;; them and move them by hand - if you don't, you end up with
|
|
|
|
;;
|
|
|
|
;; <span class="foo"><a href="bar">texta</span><span class="bletch"></a>...
|
|
|
|
;;
|
|
|
|
;; instead of:
|
|
|
|
;;
|
|
|
|
;; <span class="foo"><a href="bar">texta</a></span><span class="bletch">...
|
|
|
|
;;
|
|
|
|
;; If my analysis of the problem is correct, we can detect link-ness by
|
|
|
|
;; either hfy-linkp or hfy-endl properties at the insertion point, but I
|
|
|
|
;; think we only need to relocate the hfy-endl property, as the hfy-linkp
|
|
|
|
;; property has already served its main purpose by this point.
|
|
|
|
;;(message "mapcar over the CSS-MAP")
|
2014-03-04 03:18:55 +00:00
|
|
|
;; (message "invis-ranges:\n%S" invis-ranges)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (point-face css-map)
|
|
|
|
(let ((pt (car point-face))
|
|
|
|
(fn (cdr point-face))
|
|
|
|
(move-link nil))
|
|
|
|
(goto-char pt)
|
|
|
|
(setq move-link
|
|
|
|
(or (get-text-property pt 'hfy-linkp)
|
|
|
|
(get-text-property pt 'hfy-endl )))
|
|
|
|
(if (eq 'end fn)
|
2012-03-17 14:03:54 +00:00
|
|
|
(funcall hfy-end-span-handler)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(if (not (and srcdir file))
|
|
|
|
nil
|
|
|
|
(when move-link
|
|
|
|
(remove-text-properties (point) (1+ (point)) '(hfy-endl nil))
|
|
|
|
(put-text-property pt (1+ pt) 'hfy-endl t) ))
|
|
|
|
;; if we have invisible blocks, we need to do some extra magic:
|
2012-03-17 14:03:54 +00:00
|
|
|
(funcall hfy-begin-span-handler
|
|
|
|
(hfy-lookup fn css-sheet)
|
|
|
|
(and invis-ranges
|
|
|
|
(format "%s" (hfy-invisible-name pt invis-ranges)))
|
|
|
|
(and invis-ranges pt)
|
|
|
|
(and invis-ranges (assq pt invis-ranges)))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(if (not move-link) nil
|
|
|
|
;;(message "removing prop2 @ %d" (point))
|
|
|
|
(if (remove-text-properties (point) (1+ (point)) '(hfy-endl nil))
|
|
|
|
(put-text-property pt (1+ pt) 'hfy-endl t))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
;; #####################################################################
|
|
|
|
;; Invisibility
|
|
|
|
;; Maybe just make the text invisible in XHTML?
|
|
|
|
;; DONE -- big block of obsolete invisibility code elided here -- v
|
|
|
|
;; #####################################################################
|
|
|
|
;; (message "checking to see whether we should link...")
|
|
|
|
(if (and srcdir file)
|
|
|
|
(let ((lp 'hfy-link)
|
2011-01-27 17:04:07 +00:00
|
|
|
(pt (point-min))
|
2009-11-19 20:21:01 +00:00
|
|
|
(pr nil)
|
|
|
|
(rr nil))
|
|
|
|
;; (message " yes we should.")
|
2011-01-27 17:04:07 +00:00
|
|
|
;; translate 'hfy-anchor properties to anchors
|
|
|
|
(while (setq pt (next-single-property-change pt 'hfy-anchor))
|
|
|
|
(if (setq pr (get-text-property pt 'hfy-anchor))
|
|
|
|
(progn (goto-char pt)
|
|
|
|
(remove-text-properties pt (1+ pt) '(hfy-anchor nil))
|
|
|
|
(insert (concat "<a name=\"" pr "\"></a>")))))
|
|
|
|
;; translate alternate 'hfy-link and 'hfy-endl props to opening
|
|
|
|
;; and closing links. (this should avoid those spurious closes
|
|
|
|
;; we sometimes get by generating only paired tags)
|
|
|
|
(setq pt (point-min))
|
|
|
|
(while (setq pt (next-single-property-change pt lp))
|
|
|
|
(if (not (setq pr (get-text-property pt lp))) nil
|
|
|
|
(goto-char pt)
|
|
|
|
(remove-text-properties pt (1+ pt) (list lp nil))
|
2016-11-21 19:50:15 +00:00
|
|
|
(cl-case lp
|
2011-01-27 17:04:07 +00:00
|
|
|
(hfy-link
|
|
|
|
(if (setq rr (get-text-property pt 'hfy-inst))
|
|
|
|
(insert (format "<a name=\"%s\"></a>" rr)))
|
|
|
|
(insert (format "<a href=\"%s\">" pr))
|
|
|
|
(setq lp 'hfy-endl))
|
|
|
|
(hfy-endl
|
|
|
|
(insert "</a>") (setq lp 'hfy-link)) ))) ))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; #####################################################################
|
|
|
|
;; transform the dangerous chars. This changes character positions
|
|
|
|
;; since entities have > char length.
|
|
|
|
;; note that this deletes the dangerous characters, and therefore
|
|
|
|
;; destroys any properties they may contain (such as 'hfy-endl),
|
|
|
|
;; so we have to do this after we use said properties:
|
|
|
|
;; (message "munging dangerous characters")
|
|
|
|
(hfy-html-dekludge-buffer)
|
2012-03-17 14:03:54 +00:00
|
|
|
(unless (hfy-opt 'body-text-only)
|
|
|
|
;; insert the stylesheet at the top:
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
|
|
;;(message "inserting stylesheet")
|
|
|
|
(insert (hfy-sprintf-stylesheet css-sheet file))
|
|
|
|
|
|
|
|
(if (hfy-opt 'div-wrapper) (insert "<div class=\"default\">"))
|
|
|
|
(insert "\n<pre>")
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert "</pre>\n")
|
|
|
|
(if (hfy-opt 'div-wrapper) (insert "</div>"))
|
|
|
|
;;(message "inserting footer")
|
|
|
|
(insert (funcall hfy-page-footer file)))
|
2009-11-19 20:21:01 +00:00
|
|
|
;; call any post html-generation hooks:
|
2012-10-23 15:06:07 +00:00
|
|
|
(run-hooks 'hfy-post-html-hook)
|
2009-11-19 20:21:01 +00:00
|
|
|
;; return the html buffer
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
html-buffer))
|
|
|
|
|
2012-03-17 14:03:54 +00:00
|
|
|
(defun htmlfontify-string (string)
|
|
|
|
"Take a STRING and return a fontified version of it.
|
|
|
|
It is assumed that STRING has text properties that allow it to be
|
|
|
|
fontified. This is a simple convenience wrapper around
|
|
|
|
`htmlfontify-buffer'."
|
2015-04-06 06:40:54 +00:00
|
|
|
(let* ((hfy-optimizations-1 (copy-sequence hfy-optimizations))
|
2016-11-21 19:50:15 +00:00
|
|
|
(hfy-optimizations (cl-pushnew 'skip-refontification hfy-optimizations-1)))
|
2012-03-17 14:03:54 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(insert string)
|
|
|
|
(htmlfontify-buffer)
|
|
|
|
(buffer-string))))
|
|
|
|
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun hfy-force-fontification ()
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Try to force font-locking even when it is optimized away."
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(run-hooks 'hfy-init-kludge-hook)
|
2009-11-19 20:21:01 +00:00
|
|
|
(eval-and-compile (require 'font-lock))
|
|
|
|
(if (boundp 'font-lock-cache-position)
|
|
|
|
(or font-lock-cache-position
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(setq font-lock-cache-position (make-marker))))
|
|
|
|
(cond
|
|
|
|
(noninteractive
|
2009-11-19 20:21:01 +00:00
|
|
|
(message "hfy batch mode (%s:%S)"
|
|
|
|
(or (buffer-file-name) (buffer-name)) major-mode)
|
2018-03-05 20:58:57 +00:00
|
|
|
(if (fboundp 'font-lock-ensure) ; Emacs >= 25.1
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(font-lock-ensure)
|
|
|
|
(when font-lock-defaults
|
2018-03-05 20:58:57 +00:00
|
|
|
; Silence "interactive use only" warning on Emacs >= 25.1.
|
|
|
|
(with-no-warnings (font-lock-fontify-buffer)))))
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
((fboundp #'jit-lock-fontify-now)
|
|
|
|
(message "hfy jit-lock mode (%S %S)" window-system major-mode)
|
|
|
|
(jit-lock-fontify-now))
|
|
|
|
(t
|
|
|
|
(message "hfy interactive mode (%S %S)" window-system major-mode)
|
|
|
|
;; If jit-lock is not in use, then the buffer is already fontified!
|
|
|
|
;; (when (and font-lock-defaults
|
|
|
|
;; font-lock-mode)
|
|
|
|
;; (font-lock-fontify-region (point-min) (point-max) nil))
|
|
|
|
)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2010-04-17 02:07:48 +00:00
|
|
|
;;;###autoload
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun htmlfontify-buffer (&optional srcdir file)
|
|
|
|
"Create a new buffer, named for the current buffer + a .html extension,
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
containing an inline CSS-stylesheet and formatted CSS-markup HTML
|
2009-11-19 20:21:01 +00:00
|
|
|
that reproduces the look of the current Emacs buffer as closely
|
|
|
|
as possible.
|
|
|
|
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
Dangerous characters in the existing buffer are turned into HTML
|
|
|
|
entities, so you should even be able to do HTML-within-HTML
|
2009-11-19 20:21:01 +00:00
|
|
|
fontified display.
|
|
|
|
|
2016-08-31 02:44:41 +00:00
|
|
|
You should, however, note that random control or non-ASCII
|
|
|
|
characters such as ^L (U+000C FORM FEED (FF)) or ¤ (U+00A4
|
|
|
|
CURRENCY SIGN) won't get mapped yet.
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
If the SRCDIR and FILE arguments are set, lookup etags derived
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
entries in the `hfy-tags-cache' and add HTML anchors and
|
2009-11-19 20:21:01 +00:00
|
|
|
hyperlinks as appropriate."
|
|
|
|
(interactive)
|
|
|
|
;; pick up the file name in case we didn't receive it
|
|
|
|
(if (not file)
|
|
|
|
(progn (setq file (or (buffer-file-name) (buffer-name)))
|
2011-01-27 17:04:07 +00:00
|
|
|
(if (string-match "/\\([^/]*\\)\\'" file)
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq file (match-string 1 file)))) )
|
|
|
|
|
|
|
|
(if (not (hfy-opt 'skip-refontification))
|
|
|
|
(save-excursion ;; Keep region
|
|
|
|
(hfy-force-fontification)))
|
2011-04-19 13:44:55 +00:00
|
|
|
(if (called-interactively-p 'any) ;; display the buffer in interactive mode:
|
2009-11-19 20:21:01 +00:00
|
|
|
(switch-to-buffer (hfy-fontify-buffer srcdir file))
|
|
|
|
(hfy-fontify-buffer srcdir file)))
|
|
|
|
|
|
|
|
;; recursive file listing
|
|
|
|
(defun hfy-list-files (directory)
|
|
|
|
"Return a list of files under DIRECTORY.
|
|
|
|
Strips any leading \"./\" from each filename."
|
|
|
|
;;(message "hfy-list-files");;DBUG
|
2011-11-15 17:37:37 +00:00
|
|
|
;; FIXME: this changes the dir of the current buffer. Is that right??
|
2009-11-19 20:21:01 +00:00
|
|
|
(cd directory)
|
|
|
|
(mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F))
|
|
|
|
(split-string (shell-command-to-string hfy-find-cmd))) )
|
|
|
|
|
2011-11-17 09:09:20 +00:00
|
|
|
;; strip the filename off, return a directory name
|
2011-11-19 09:18:31 +00:00
|
|
|
;; not a particularly thorough implementation, but it will be
|
2009-11-19 20:21:01 +00:00
|
|
|
;; fed pretty carefully, so it should be Ok:
|
|
|
|
(defun hfy-dirname (file)
|
|
|
|
"Return everything preceding the last \"/\" from a relative filename FILE,
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
on the assumption that this will produce a relative directory name.
|
|
|
|
Hardly bombproof, but good enough in the context in which it is being used."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-dirname");;DBUG
|
|
|
|
(let ((f (directory-file-name file)))
|
|
|
|
(and (string-match "^\\(.*\\)/" f) (match-string 1 f))))
|
|
|
|
|
|
|
|
;; create a directory, cf mkdir -p
|
|
|
|
(defun hfy-make-directory (dir)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Approx. equivalent of mkdir -p DIR."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-make-directory");;DBUG
|
|
|
|
(if (file-exists-p dir)
|
|
|
|
(if (file-directory-p dir) t)
|
|
|
|
(make-directory dir t)))
|
|
|
|
|
|
|
|
(defun hfy-text-p (srcdir file)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Is SRCDIR/FILE text? Uses `hfy-istext-command' to determine this."
|
2009-11-19 20:47:40 +00:00
|
|
|
(let* ((cmd (format hfy-istext-command (expand-file-name file srcdir)))
|
|
|
|
(rsp (shell-command-to-string cmd)))
|
2011-01-27 17:04:07 +00:00
|
|
|
(string-match "text" rsp)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; open a file, check fontification, if fontified, write a fontified copy
|
|
|
|
;; to the destination directory, otherwise just copy the file:
|
|
|
|
(defun hfy-copy-and-fontify-file (srcdir dstdir file)
|
|
|
|
"Open FILE in SRCDIR - if fontified, write a fontified copy to DSTDIR
|
|
|
|
adding an extension of `hfy-extn'. Fontification is actually done by
|
|
|
|
`htmlfontify-buffer'. If the buffer is not fontified, just copy it."
|
|
|
|
;;(message "hfy-copy-and-fontify-file");;DBUG
|
|
|
|
(let (;;(fast-lock-minimum-size hfy-fast-lock-save)
|
|
|
|
;;(font-lock-support-mode 'fast-lock-mode)
|
|
|
|
;;(window-system (or window-system 'htmlfontify))
|
|
|
|
(target nil)
|
|
|
|
(source nil)
|
|
|
|
(html nil))
|
|
|
|
(cd srcdir)
|
2009-11-19 20:47:40 +00:00
|
|
|
(with-current-buffer (setq source (find-file-noselect file))
|
|
|
|
;; FIXME: Shouldn't this use expand-file-name? --Stef
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq target (concat dstdir "/" file))
|
|
|
|
(hfy-make-directory (hfy-dirname target))
|
|
|
|
(if (not (hfy-opt 'skip-refontification)) (hfy-force-fontification))
|
|
|
|
(if (or (hfy-fontified-p) (hfy-text-p srcdir file))
|
|
|
|
(progn (setq html (hfy-fontify-buffer srcdir file))
|
|
|
|
(set-buffer html)
|
|
|
|
(write-file (concat target hfy-extn))
|
|
|
|
(kill-buffer html))
|
|
|
|
;; #o0200 == 128, but emacs20 doesn't know that
|
|
|
|
(if (and (file-exists-p target) (not (file-writable-p target)))
|
|
|
|
(set-file-modes target (logior (file-modes target) 128)))
|
|
|
|
(copy-file (buffer-file-name source) target 'overwrite))
|
|
|
|
(kill-buffer source)) ))
|
|
|
|
|
|
|
|
;; list of tags in file in srcdir
|
2011-01-27 17:04:07 +00:00
|
|
|
(defun hfy-tags-for-file (cache-hash file)
|
2009-11-19 20:21:01 +00:00
|
|
|
"List of etags tags that have definitions in this FILE.
|
2011-01-27 17:04:07 +00:00
|
|
|
CACHE-HASH is the tags cache."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-tags-for-file");;DBUG
|
2011-01-27 17:04:07 +00:00
|
|
|
(let* ((tag-list nil))
|
|
|
|
(if cache-hash
|
2009-11-19 20:21:01 +00:00
|
|
|
(maphash
|
|
|
|
(lambda (K V)
|
|
|
|
(if (assoc file V)
|
2011-01-27 17:04:07 +00:00
|
|
|
(setq tag-list (cons K tag-list))))
|
|
|
|
cache-hash))
|
2009-11-19 20:21:01 +00:00
|
|
|
tag-list))
|
|
|
|
|
|
|
|
;; mark the tags native to this file for anchors
|
|
|
|
(defun hfy-mark-tag-names (srcdir file)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Mark tags in FILE (lookup SRCDIR in `hfy-tags-cache') with the `hfy-anchor'
|
2009-11-19 20:21:01 +00:00
|
|
|
property, with a value of \"tag.line-number\"."
|
|
|
|
;;(message "(hfy-mark-tag-names %s %s)" srcdir file);;DBUG
|
2011-01-27 17:04:07 +00:00
|
|
|
(let* ((cache-entry (assoc srcdir hfy-tags-cache))
|
|
|
|
(cache-hash (cadr cache-entry)))
|
|
|
|
(if cache-hash
|
2009-11-19 20:21:01 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (TAG)
|
|
|
|
(mapcar
|
|
|
|
(lambda (TLIST)
|
|
|
|
(if (string= file (car TLIST))
|
|
|
|
(let* ((line (cadr TLIST) )
|
2016-11-21 19:50:15 +00:00
|
|
|
(chr (cl-caddr TLIST))
|
2009-11-19 20:21:01 +00:00
|
|
|
(link (format "%s.%d" TAG line) ))
|
|
|
|
(put-text-property (+ 1 chr)
|
|
|
|
(+ 2 chr)
|
|
|
|
'hfy-anchor link))))
|
|
|
|
(gethash TAG cache-hash)))
|
2011-01-27 17:04:07 +00:00
|
|
|
(hfy-tags-for-file cache-hash file)))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-relstub (file &optional start)
|
|
|
|
"Return a \"../\" stub of the appropriate length for the current source
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
tree depth, as determined from FILE (a filename).
|
2009-11-19 20:21:01 +00:00
|
|
|
START is the offset at which to start looking for the / character in FILE."
|
|
|
|
;;(message "hfy-relstub");;DBUG
|
|
|
|
(let ((c ""))
|
|
|
|
(while (setq start (string-match "/" file start))
|
2011-01-27 17:04:07 +00:00
|
|
|
(setq start (1+ start)) (setq c (concat c "../")))
|
|
|
|
c))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-href-stub (this-file def-files tag)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Return an href stub for a tag href in THIS-FILE.
|
|
|
|
If DEF-FILES (list of files containing definitions for the tag in question)
|
2009-11-19 20:21:01 +00:00
|
|
|
contains only one entry, the href should link straight to that file.
|
|
|
|
Otherwise, the link should be to the index file.\n
|
|
|
|
We are not yet concerned with the file extensions/tag line number and so on at
|
|
|
|
this point.\n
|
|
|
|
If `hfy-split-index' is set, and the href wil be to an index file rather than
|
|
|
|
a source file, append a .X to `hfy-index-file', where X is the uppercased
|
|
|
|
first character of TAG.\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-relstub', `hfy-index-file'."
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "hfy-href-stub");;DBUG
|
2009-11-19 20:47:40 +00:00
|
|
|
;; FIXME: Why not use something like
|
|
|
|
;; (file-relative-name (if ...) (file-name-directory this-file)) ? --Stef
|
2009-11-19 20:21:01 +00:00
|
|
|
(concat
|
|
|
|
(hfy-relstub this-file)
|
|
|
|
(if (= 1 (length def-files)) (car def-files)
|
|
|
|
(if (not hfy-split-index) hfy-index-file
|
|
|
|
(concat hfy-index-file "." (upcase (substring tag 0 1)))))) )
|
|
|
|
|
|
|
|
(defun hfy-href (this-file def-files tag tag-map)
|
|
|
|
"Return a relative href to the tag in question, based on\n
|
|
|
|
THIS-FILE `hfy-link-extn' `hfy-extn' DEF-FILES TAG and TAG-MAP\n
|
|
|
|
THIS-FILE is the current source file
|
|
|
|
DEF-FILES is a list of file containing possible link endpoints for TAG
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
TAG is the tag in question
|
2009-11-19 20:21:01 +00:00
|
|
|
TAG-MAP is the entry in `hfy-tags-cache'."
|
|
|
|
;;(message "hfy-href");;DBUG
|
|
|
|
(concat
|
|
|
|
(hfy-href-stub this-file def-files tag)
|
|
|
|
(or hfy-link-extn hfy-extn) "#" tag ;;(.src -> .html)
|
|
|
|
(if (= 1 (length def-files))
|
|
|
|
(concat "." (format "%d" (cadr (assoc (car def-files) tag-map)))))) )
|
|
|
|
|
|
|
|
(defun hfy-word-regex (string)
|
|
|
|
"Return a regex that matches STRING as the first `match-string', with non
|
|
|
|
word characters on either side."
|
2009-11-19 20:47:40 +00:00
|
|
|
;; FIXME: Should this use [^$[:alnum:]_] instead? --Stef
|
2009-11-19 20:21:01 +00:00
|
|
|
(concat "[^$A-Za-z_0-9]\\(" (regexp-quote string) "\\)[^A-Za-z_0-9]"))
|
|
|
|
|
|
|
|
;; mark all tags for hyperlinking, except the tags at
|
|
|
|
;; their own points of definition, iyswim:
|
|
|
|
(defun hfy-mark-tag-hrefs (srcdir file)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Mark href start points with the `hfy-link' prop (value: href string).\n
|
|
|
|
Mark href end points with the `hfy-endl' prop (value t).\n
|
2009-11-19 20:21:01 +00:00
|
|
|
Avoid overlapping links, and mark links in descending length of
|
|
|
|
tag name in order to prevent subtags from usurping supertags,
|
|
|
|
\(eg \"term\" for \"terminal\").
|
|
|
|
SRCDIR is the directory being \"published\".
|
|
|
|
FILE is the specific file we are rendering."
|
|
|
|
;;(message "hfy-mark-tag-hrefs");;DBUG
|
|
|
|
(let ((cache-entry (assoc srcdir hfy-tags-cache))
|
|
|
|
(list-cache (assoc srcdir hfy-tags-sortl))
|
|
|
|
(rmap-cache (assoc srcdir hfy-tags-rmap ))
|
|
|
|
(no-comment (hfy-opt 'zap-comment-links))
|
|
|
|
(no-strings (hfy-opt 'zap-string-links ))
|
|
|
|
(cache-hash nil)
|
|
|
|
(tags-list nil)
|
|
|
|
(tags-rmap nil)
|
|
|
|
(case-fold-search nil))
|
|
|
|
;; extract the tag mapping hashes (fwd and rev) and the tag list:
|
|
|
|
(if (and (setq cache-hash (cadr cache-entry))
|
|
|
|
(setq tags-rmap (cadr rmap-cache ))
|
|
|
|
(setq tags-list (cadr list-cache )))
|
|
|
|
(mapcar
|
|
|
|
(lambda (TAG)
|
|
|
|
(let* ((start nil)
|
|
|
|
(stop nil)
|
|
|
|
(href nil)
|
|
|
|
(name nil)
|
|
|
|
(case-fold-search nil)
|
|
|
|
(tmp-point nil)
|
|
|
|
(maybe-start nil)
|
|
|
|
(face-at nil)
|
|
|
|
(rmap-entry nil)
|
|
|
|
(rnew-elt nil)
|
|
|
|
(rmap-line nil)
|
|
|
|
(tag-regex (hfy-word-regex TAG))
|
|
|
|
(tag-map (gethash TAG cache-hash))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(tag-files (mapcar #'car tag-map)))
|
2009-11-19 20:21:01 +00:00
|
|
|
;; find instances of TAG and do what needs to be done:
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward TAG nil 'NOERROR)
|
|
|
|
(setq tmp-point (point)
|
|
|
|
maybe-start (- (match-beginning 0) 1))
|
|
|
|
(goto-char maybe-start)
|
|
|
|
(if (not (looking-at tag-regex))
|
|
|
|
nil
|
|
|
|
(setq start (match-beginning 1))
|
|
|
|
(setq stop (match-end 1))
|
|
|
|
(setq face-at
|
|
|
|
(and (or no-comment no-strings) (hfy-face-at start)))
|
|
|
|
(if (listp face-at)
|
|
|
|
(setq face-at (cadr (memq :inherit face-at))))
|
|
|
|
(if (or (text-property-any start (1+ stop) 'hfy-linkp t)
|
|
|
|
(and no-comment (eq 'font-lock-comment-face face-at))
|
|
|
|
(and no-strings (eq 'font-lock-string-face face-at)))
|
|
|
|
nil ;; already a link, NOOP
|
|
|
|
|
|
|
|
;; set a reverse map entry:
|
|
|
|
(setq rmap-line (line-number-at-pos)
|
|
|
|
rmap-entry (gethash TAG tags-rmap)
|
|
|
|
rnew-elt (list file rmap-line start)
|
|
|
|
rmap-entry (cons rnew-elt rmap-entry)
|
|
|
|
name (format "%s.%d" TAG rmap-line))
|
|
|
|
(put-text-property start (1+ start) 'hfy-inst name)
|
|
|
|
(puthash TAG rmap-entry tags-rmap)
|
|
|
|
|
|
|
|
;; mark the link. link to index if the tag has > 1 def
|
|
|
|
;; add the line number to the #name if it does not:
|
|
|
|
(setq href (hfy-href file tag-files TAG tag-map))
|
|
|
|
(put-text-property start (1+ start) 'hfy-link href)
|
|
|
|
(put-text-property stop (1+ stop ) 'hfy-endl t )
|
|
|
|
(put-text-property start (1+ stop ) 'hfy-linkp t )))
|
|
|
|
(goto-char tmp-point)) ))
|
|
|
|
tags-list) )))
|
|
|
|
|
|
|
|
(defun hfy-shell ()
|
2011-11-30 16:33:05 +00:00
|
|
|
"Return `shell-file-name', or \"/bin/sh\" if it is a non-Bourne shell."
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (string-match "\\<bash\\>\\|\\<sh\\>\\|\\<dash\\>" shell-file-name)
|
|
|
|
shell-file-name
|
|
|
|
(or hfy-shell-file-name "/bin/sh")))
|
|
|
|
|
|
|
|
;; cache the #(tag => file line point) entries for files under srcdir
|
|
|
|
;; and cache the descending sorted list of tags in the relevant alist,
|
|
|
|
;; also keyed by srcdir:
|
|
|
|
(defun hfy-load-tags-cache (srcdir)
|
|
|
|
"Run `hfy-etags-cmd' on SRCDIR, then call `hfy-parse-tags-buffer'."
|
|
|
|
;;(message "hfy-load-tags-cache");;DBUG
|
|
|
|
(let ((etags-buffer (get-buffer-create "*hfy-tags*"))
|
|
|
|
(etags-command (format hfy-etags-cmd hfy-etags-bin))
|
|
|
|
(shell-file-name (hfy-shell)))
|
|
|
|
(cd srcdir)
|
|
|
|
(shell-command etags-command etags-buffer)
|
|
|
|
(hfy-parse-tags-buffer srcdir etags-buffer)) )
|
|
|
|
|
|
|
|
;; break this out from `hfy-load-tags-cache' to make the tar file
|
|
|
|
;; functionality easier to implement.
|
|
|
|
;; ( tar file functionality not merged here because it requires a
|
|
|
|
;; hacked copy of etags capable of tagging stdin: if Francesco
|
2014-01-16 06:24:06 +00:00
|
|
|
;; Potortì accepts a patch, or otherwise implements stdin tagging,
|
2009-11-19 20:21:01 +00:00
|
|
|
;; then I will provide a `htmlfontify-tar-file' defun )
|
|
|
|
(defun hfy-parse-tags-buffer (srcdir buffer)
|
|
|
|
"Parse a BUFFER containing etags formatted output, loading the
|
|
|
|
`hfy-tags-cache' and `hfy-tags-sortl' entries for SRCDIR."
|
|
|
|
(let ((cache-entry (assoc srcdir hfy-tags-cache))
|
|
|
|
(tlist-cache (assoc srcdir hfy-tags-sortl))
|
|
|
|
(trmap-cache (assoc srcdir hfy-tags-rmap ))
|
|
|
|
(cache-hash nil) (trmap-hash nil) (tags-list nil)
|
|
|
|
(hash-entry nil) (tag-string nil) (tag-line nil)
|
|
|
|
(tag-point nil) (new-entry nil) (etags-file nil))
|
|
|
|
|
2011-11-20 02:29:42 +00:00
|
|
|
;; (re)initialize the tag reverse map:
|
2009-11-19 20:21:01 +00:00
|
|
|
(if trmap-cache (setq trmap-hash (cadr trmap-cache))
|
|
|
|
(setq trmap-hash (make-hash-table :test 'equal))
|
|
|
|
(setq hfy-tags-rmap (list (list srcdir trmap-hash) hfy-tags-rmap)))
|
|
|
|
(clrhash trmap-hash)
|
|
|
|
|
2011-11-20 02:29:42 +00:00
|
|
|
;; (re)initialize the tag cache:
|
2009-11-19 20:21:01 +00:00
|
|
|
(if cache-entry (setq cache-hash (cadr cache-entry))
|
|
|
|
(setq cache-hash (make-hash-table :test 'equal))
|
|
|
|
(setq hfy-tags-cache (list (list srcdir cache-hash) hfy-tags-cache)))
|
|
|
|
(clrhash cache-hash)
|
|
|
|
|
|
|
|
;; cache the TAG => ((file line point) (file line point) ... ) entries:
|
2009-11-19 20:47:40 +00:00
|
|
|
(with-current-buffer buffer
|
2009-11-19 20:21:01 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
|
|
(while (and (looking-at "^\x0c") (= 0 (forward-line 1)))
|
|
|
|
;;(message "^L boundary")
|
|
|
|
(if (and (looking-at "^\\(.+\\),\\([0-9]+\\)$")
|
|
|
|
(= 0 (forward-line 1)))
|
|
|
|
(progn
|
|
|
|
(setq etags-file (match-string 1))
|
|
|
|
;;(message "TAGS for file: %s" etags-file)
|
|
|
|
(while (and (looking-at hfy-etag-regex) (= 0 (forward-line 1)))
|
|
|
|
(setq tag-string (match-string 1))
|
|
|
|
(if (= 0 (length tag-string)) nil ;; noop
|
|
|
|
(setq tag-line (round (string-to-number (match-string 2))))
|
|
|
|
(setq tag-point (round (string-to-number (match-string 3))))
|
|
|
|
(setq hash-entry (gethash tag-string cache-hash))
|
|
|
|
(setq new-entry (list etags-file tag-line tag-point))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(push new-entry hash-entry)
|
2009-11-19 20:21:01 +00:00
|
|
|
;;(message "HASH-ENTRY %s %S" tag-string new-entry)
|
|
|
|
(puthash tag-string hash-entry cache-hash)))) )))
|
|
|
|
|
|
|
|
;; cache a list of tags in descending length order:
|
2011-04-19 13:44:55 +00:00
|
|
|
(maphash (lambda (K _V) (push K tags-list)) cache-hash)
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq tags-list (sort tags-list (lambda (A B) (< (length B) (length A)))))
|
|
|
|
|
|
|
|
;; put the tag list into the cache:
|
|
|
|
(if tlist-cache (setcar (cdr tlist-cache) tags-list)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(push (list srcdir tags-list) hfy-tags-sortl))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;; return the number of tags found:
|
|
|
|
(length tags-list) ))
|
|
|
|
|
|
|
|
(defun hfy-prepare-index-i (srcdir dstdir filename &optional stub map)
|
|
|
|
"Prepare a tags index buffer for SRCDIR.
|
|
|
|
`hfy-tags-cache' must already have an entry for SRCDIR for this to work.
|
|
|
|
`hfy-page-header', `hfy-page-footer', `hfy-link-extn' and `hfy-extn'
|
|
|
|
all play a part here.\n
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
If STUB is set, prepare an (appropriately named) index buffer
|
2009-11-19 20:21:01 +00:00
|
|
|
specifically for entries beginning with STUB.\n
|
|
|
|
If MAP is set, use that instead of `hfy-tags-cache'.
|
|
|
|
FILENAME is the name of the file being indexed.
|
|
|
|
DSTDIR is the output directory, where files will be written."
|
|
|
|
;;(message "hfy-write-index");;DBUG
|
|
|
|
(let ((cache-entry (assoc srcdir (or map hfy-tags-cache)))
|
|
|
|
(cache-hash nil)
|
|
|
|
(tag-list nil)
|
|
|
|
(index-file
|
|
|
|
(concat filename (if stub (concat "." stub) "") hfy-extn))
|
|
|
|
(index-buf nil))
|
|
|
|
(if (not (and cache-entry
|
|
|
|
(setq cache-hash (cadr cache-entry))
|
|
|
|
(setq index-buf (get-buffer-create index-file))))
|
|
|
|
nil ;; noop
|
2011-04-19 13:44:55 +00:00
|
|
|
(maphash (lambda (K _V) (push K tag-list)) cache-hash)
|
2009-11-19 20:21:01 +00:00
|
|
|
(setq tag-list (sort tag-list 'string<))
|
|
|
|
(set-buffer index-buf)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert (funcall hfy-page-header filename "<!-- CSS -->"))
|
|
|
|
(insert "<table class=\"index\">\n")
|
|
|
|
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (TAG tag-list)
|
|
|
|
(let ((tag-started nil))
|
|
|
|
(dolist (DEF (gethash TAG cache-hash))
|
|
|
|
(if (and stub (not (string-match (concat "^" stub) TAG)))
|
|
|
|
nil ;; we have a stub and it didn't match: NOOP
|
|
|
|
(let ((file (car DEF))
|
|
|
|
(line (cadr DEF)))
|
|
|
|
(insert
|
|
|
|
(format
|
|
|
|
(concat
|
|
|
|
" <tr> \n"
|
|
|
|
" <td>%s</td> \n"
|
|
|
|
" <td><a href=\"%s%s\">%s</a></td> \n"
|
|
|
|
" <td><a href=\"%s%s#%s.%d\">%d</a></td>\n"
|
|
|
|
" </tr> \n")
|
|
|
|
(if (string= TAG tag-started) " "
|
|
|
|
(format "<a name=\"%s\">%s</a>" TAG TAG))
|
|
|
|
file (or hfy-link-extn hfy-extn) file
|
|
|
|
file (or hfy-link-extn hfy-extn) TAG line line))
|
|
|
|
(setq tag-started TAG))))))
|
2009-11-19 20:21:01 +00:00
|
|
|
(insert "</table>\n")
|
|
|
|
(insert (funcall hfy-page-footer filename))
|
|
|
|
(and dstdir (cd dstdir))
|
|
|
|
(set-visited-file-name index-file)
|
|
|
|
index-buf) ))
|
|
|
|
|
|
|
|
(defun hfy-prepare-index (srcdir dstdir)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Return a list of index buffer(s), as determined by `hfy-split-index'.
|
2009-11-19 20:21:01 +00:00
|
|
|
SRCDIR and DSTDIR are the source and output directories respectively."
|
|
|
|
(if (not hfy-split-index)
|
|
|
|
(list (hfy-prepare-index-i srcdir dstdir hfy-index-file nil))
|
|
|
|
(let ((stub-list nil)
|
|
|
|
(cache-hash nil)
|
|
|
|
(index-list nil)
|
|
|
|
(cache-entry (assoc srcdir hfy-tags-cache)))
|
|
|
|
(if (and cache-entry (setq cache-hash (cadr cache-entry)))
|
|
|
|
(maphash
|
2011-04-19 13:44:55 +00:00
|
|
|
(lambda (K _V)
|
2009-11-19 20:21:01 +00:00
|
|
|
(let ((stub (upcase (substring K 0 1))))
|
|
|
|
(if (member stub stub-list)
|
|
|
|
nil ;; seen this already: NOOP
|
|
|
|
(setq
|
|
|
|
stub-list (cons stub stub-list)
|
|
|
|
index-list (cons (hfy-prepare-index-i srcdir
|
|
|
|
dstdir
|
|
|
|
hfy-index-file
|
|
|
|
stub)
|
2011-01-27 17:04:07 +00:00
|
|
|
index-list)) )))
|
|
|
|
cache-hash) )
|
|
|
|
index-list)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-prepare-tag-map (srcdir dstdir)
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
"Prepare the counterpart(s) to the index buffer(s) - a list of buffers
|
|
|
|
with the same structure, but listing (and linking to) instances of tags
|
|
|
|
\(as opposed to their definitions).\n
|
2009-11-19 20:21:01 +00:00
|
|
|
SRCDIR and DSTDIR are the source and output directories respectively.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-prepare-index', `hfy-split-index'."
|
2009-11-19 20:21:01 +00:00
|
|
|
(if (not hfy-split-index)
|
|
|
|
(list (hfy-prepare-index-i srcdir
|
|
|
|
dstdir
|
|
|
|
hfy-instance-file
|
|
|
|
nil
|
|
|
|
hfy-tags-rmap))
|
|
|
|
(let ((stub-list nil)
|
|
|
|
(cache-hash nil)
|
|
|
|
(index-list nil)
|
|
|
|
(cache-entry (assoc srcdir hfy-tags-rmap)))
|
|
|
|
|
|
|
|
(if (and cache-entry (setq cache-hash (cadr cache-entry)))
|
|
|
|
(maphash
|
2011-04-19 13:44:55 +00:00
|
|
|
(lambda (K _V)
|
2009-11-19 20:21:01 +00:00
|
|
|
(let ((stub (upcase (substring K 0 1))))
|
|
|
|
(if (member stub stub-list)
|
|
|
|
nil ;; seen this already: NOOP
|
|
|
|
(setq
|
|
|
|
stub-list (cons stub stub-list)
|
|
|
|
index-list (cons (hfy-prepare-index-i srcdir
|
|
|
|
dstdir
|
|
|
|
hfy-instance-file
|
|
|
|
stub
|
|
|
|
hfy-tags-rmap)
|
2011-01-27 17:04:07 +00:00
|
|
|
index-list)) )))
|
|
|
|
cache-hash) )
|
|
|
|
index-list)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun hfy-subtract-maps (srcdir)
|
|
|
|
"Internal function - strips definitions of tags from the instance map.
|
|
|
|
SRCDIR is the directory being \"published\".
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-tags-cache', `hfy-tags-rmap'."
|
2009-11-19 20:21:01 +00:00
|
|
|
(let ((new-list nil)
|
|
|
|
(old-list nil)
|
|
|
|
(def-list nil)
|
|
|
|
(exc-list nil)
|
|
|
|
(fwd-map (cadr (assoc srcdir hfy-tags-cache)))
|
|
|
|
(rev-map (cadr (assoc srcdir hfy-tags-rmap )))
|
|
|
|
(taglist (cadr (assoc srcdir hfy-tags-sortl))))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (TAG taglist)
|
|
|
|
(setq def-list (gethash TAG fwd-map)
|
|
|
|
old-list (gethash TAG rev-map)
|
|
|
|
exc-list (mapcar (lambda (P) (list (car P) (cadr P))) def-list)
|
|
|
|
new-list nil)
|
|
|
|
(dolist (P old-list)
|
|
|
|
(or (member (list (car P) (cadr P)) exc-list)
|
|
|
|
(push P new-list)))
|
|
|
|
(puthash TAG new-list rev-map))))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
(defun htmlfontify-run-etags (srcdir)
|
|
|
|
"Load the etags cache for SRCDIR.
|
Fix typos and remove superfluous backslash-quoting in htmlfontify.el.
* htmlfontify.el (htmlfontify-load-rgb-file)
(htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
(htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
(hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
(hfy-link-style-fun, hfy-index-file, hfy-instance-file)
(hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
(hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
(hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
(hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
(hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
(hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
(hfy-colour-vals, hfy-default-header, hfy-link-style-string)
(hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
(hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
(hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
(hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
(hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
(hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
(hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
(hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
(hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
(hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
(htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
backslash-quoting from parentheses, etc.
2010-01-11 17:26:28 +00:00
|
|
|
See also `hfy-load-tags-cache'."
|
2009-11-19 20:21:01 +00:00
|
|
|
(interactive "D source directory: ")
|
2011-01-27 17:04:07 +00:00
|
|
|
(hfy-load-tags-cache (directory-file-name srcdir)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
|
|
|
;;(defun hfy-test-read-args (foo bar)
|
|
|
|
;; (interactive "D source directory: \nD target directory: ")
|
|
|
|
;; (message "foo: %S\nbar: %S" foo bar))
|
|
|
|
|
|
|
|
(defun hfy-save-kill-buffers (buffer-list &optional dstdir)
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (B buffer-list)
|
|
|
|
(set-buffer B)
|
|
|
|
(and dstdir (file-directory-p dstdir) (cd dstdir))
|
|
|
|
(save-buffer)
|
|
|
|
(kill-buffer B)))
|
2009-11-19 20:21:01 +00:00
|
|
|
|
2010-04-17 02:07:48 +00:00
|
|
|
;;;###autoload
|
2009-11-19 20:21:01 +00:00
|
|
|
(defun htmlfontify-copy-and-link-dir (srcdir dstdir &optional f-ext l-ext)
|
|
|
|
"Trawl SRCDIR and write fontified-and-hyperlinked output in DSTDIR.
|
|
|
|
F-EXT and L-EXT specify values for `hfy-extn' and `hfy-link-extn'.\n
|
|
|
|
You may also want to set `hfy-page-header' and `hfy-page-footer'."
|
|
|
|
(interactive "D source directory: \nD output directory: ")
|
|
|
|
;;(message "htmlfontify-copy-and-link-dir")
|
|
|
|
(setq srcdir (directory-file-name srcdir))
|
|
|
|
(setq dstdir (directory-file-name dstdir))
|
|
|
|
(let ((source-files "SETME: list of source files, relative to srcdir")
|
|
|
|
(tr-cache (assoc srcdir hfy-tags-rmap))
|
|
|
|
(hfy-extn (or f-ext ".html"))
|
|
|
|
(hfy-link-extn (or l-ext ".html")))
|
|
|
|
;; oops, forgot to load etags for srcdir:
|
|
|
|
(if tr-cache nil
|
|
|
|
(message "autoload of tags cache")
|
|
|
|
(hfy-load-tags-cache srcdir)
|
|
|
|
(setq tr-cache (assoc srcdir hfy-tags-rmap)))
|
|
|
|
;; clear out the old cache:
|
|
|
|
(clrhash (cadr tr-cache))
|
|
|
|
(hfy-make-directory dstdir)
|
|
|
|
(setq source-files (hfy-list-files srcdir))
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
(dolist (file source-files)
|
|
|
|
(hfy-copy-and-fontify-file srcdir dstdir file))
|
2009-11-19 20:21:01 +00:00
|
|
|
(hfy-subtract-maps srcdir)
|
|
|
|
(hfy-save-kill-buffers (hfy-prepare-index srcdir dstdir) dstdir)
|
|
|
|
(hfy-save-kill-buffers (hfy-prepare-tag-map srcdir dstdir) dstdir) ))
|
|
|
|
|
|
|
|
;; name of the init file we want:
|
|
|
|
(defun hfy-initfile ()
|
|
|
|
"Return the expected location of the htmlfontify specific init/custom file."
|
|
|
|
(let* ((file (or (getenv "HFY_INITFILE") ".hfy.el")))
|
|
|
|
(expand-file-name file "~") ))
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;; incomplete as yet : transfer hook settings to hfy init file:
|
|
|
|
;; (defalias 'hfy-set-hooks 'custom-set-variables)
|
|
|
|
|
|
|
|
;; (defun hfy-pp-hook (H)
|
2011-01-27 17:04:07 +00:00
|
|
|
;; (and (string-match "-hook\\'" (symbol-name H))
|
2009-11-19 20:21:01 +00:00
|
|
|
;; (boundp H)
|
|
|
|
;; (symbol-value H)
|
|
|
|
;; (insert (format "\n '(%S %S)" H (symbol-value H)))
|
|
|
|
;; )
|
|
|
|
;; )
|
|
|
|
|
|
|
|
;; (defun hfy-save-hooks ()
|
|
|
|
;; (let ((custom-file (hfy-initfile)))
|
|
|
|
;; (custom-save-delete 'hfy-set-hooks)
|
|
|
|
;; (let ((standard-output (current-buffer)))
|
|
|
|
;; (princ "(hfy-set-hooks\n;;auto-generated, only one copy allowed\n")
|
|
|
|
;; (mapatoms 'hfy-pp-hook)
|
|
|
|
;; (insert "\n)")
|
|
|
|
;; )
|
|
|
|
;; )
|
|
|
|
;; )
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
(defalias 'hfy-init-progn 'progn)
|
|
|
|
|
|
|
|
(defun hfy-save-initvar (sym)
|
|
|
|
(princ (format "(setq %s\n '" sym))
|
|
|
|
(pp (symbol-value sym))
|
|
|
|
(princ ")\n"))
|
|
|
|
|
|
|
|
(defun htmlfontify-save-initfile ()
|
|
|
|
"Save the htmlfontify settings to the htmlfontify init file."
|
|
|
|
(interactive)
|
|
|
|
(let* ((start-pos nil)
|
|
|
|
(custom-file (hfy-initfile))
|
|
|
|
(standard-output (find-file-noselect custom-file 'nowarn)))
|
|
|
|
(save-excursion
|
|
|
|
(custom-save-delete 'hfy-init-progn)
|
|
|
|
(setq start-pos (point))
|
|
|
|
(princ "(hfy-init-progn\n;;auto-generated, only one copy allowed\n")
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
;; FIXME: This saving&restoring of global customization
|
|
|
|
;; variables can interfere with other customization settings for
|
|
|
|
;; those vars (in .emacs or in Customize).
|
2009-11-19 20:21:01 +00:00
|
|
|
(mapc 'hfy-save-initvar
|
Misc coding convention cleanups.
* htmlfontify.el (hfy-init-kludge-hook): Rename from hfy-init-kludge-hooks.
(hfy-etags-cmd, hfy-flatten-style, hfy-invisible-name, hfy-face-at)
(hfy-fontify-buffer, hfy-prepare-index-i, hfy-subtract-maps)
(hfy-save-kill-buffers, htmlfontify-copy-and-link-dir): Use dolist and push.
(hfy-slant, hfy-weight): Use tables rather than code.
(hfy-box-to-border-assoc, hfy-box-to-style, hfy-decor)
(hfy-face-to-style-i, hfy-fontify-buffer): Use `case'.
(hfy-face-attr-for-class): Initialize `face-spec' directly.
(hfy-face-to-css): Remove `nconc' with single arg.
(hfy-p-to-face-lennart): Use `or'.
(hfy-face-at): Hoist common code. Remove spurious quotes in `case'.
(hfy-overlay-props-at, hfy-mark-tag-hrefs): Eta-reduce.
(hfy-compile-stylesheet, hfy-merge-adjacent-spans)
(hfy-compile-face-map, hfy-parse-tags-buffer): Use push.
(hfy-force-fontification): Use run-hooks.
2009-11-26 16:24:36 +00:00
|
|
|
'(auto-mode-alist interpreter-mode-alist))
|
2009-11-19 20:21:01 +00:00
|
|
|
(princ ")\n")
|
|
|
|
(indent-region start-pos (point) nil))
|
|
|
|
(custom-save-all) ))
|
|
|
|
|
|
|
|
(defun htmlfontify-load-initfile ()
|
|
|
|
"Load the htmlfontify specific init/custom file."
|
|
|
|
(interactive)
|
|
|
|
(let ((file (hfy-initfile)))
|
|
|
|
(load file 'NOERROR nil nil) ))
|
|
|
|
|
|
|
|
(provide 'htmlfontify)
|
|
|
|
|
2010-04-24 02:36:43 +00:00
|
|
|
;;; htmlfontify.el ends here
|