Mercurial > emacs
view lisp/nxml/nxml-util.el @ 103344:d04aeff22966
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (ns_use_system_highlight_color): Drop, unused.
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
Changes to support :script/:lang/:otf in NS font driver.
* nsfont.m (nsfont_escape_name, nsfont_unescape_name)
(nsfont_get_family, nsfont_char_width): Rename to ns_ prefix to
indicate not part of font driver interface, and change callers.
(ns_get_family): Remove pointless null check.
(nsfont_spec_to_traits, nsfont_fmember_to_entity): Replace with
ns_spec_to_descriptor, ns_descriptor_to_entity.
(nsfont_trait_distance, nsfont_make_fontset_for_font): Remove.
(ns_attribute_value, ns_attribute_fvalue, ns_has_attribute)
(ns_spec_to_descriptor, ns_descriptor_to_entity)
(ns_charset_covers, ns_lang_to_script, ns_otf_to_script)
(ns_get_req_script, ns_accumulate_script_ranges)
(ns_script_to_charset, ns_get_covering_families, ns_findfonts):
New functions.
(nsfont_list, nsfont_match): Use ns_findfonts.
(nsfont_open): Use font descriptor instead of traits.
(nsfont_draw): Handle "automatic" (lookup-table) compositions.
(dump_glyphstring): Rename to ns_dump_glyphstring.
* nsfns.m (Fns_popup_font_panel): Use shared font manager.
* fontset.c (fontset_from_font): Remove NS-specific code.
2009-06-08 Peter Jones <pjones@pmade.com> (tiny change)
* nsterm.m (ns_draw_window_cursor): Respect cursor_type for
nonactive windows.
2009-06-08 Felix Mueller <felix@enqueue.eu> (tiny change)
* nsterm.m (ns_init_paths): Append path separator to INFOPATH
variable.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Mon, 08 Jun 2009 04:34:54 +0000 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; nxml-util.el --- utility functions for nxml-*.el ;; Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: (defconst nxml-debug nil "Enable nxml debugging. Effective only at compile time.") (defsubst nxml-debug (format &rest args) (when nxml-debug (apply #'message format args))) (defmacro nxml-debug-change (name start end) (when nxml-debug `(nxml-debug "%s: %S" ,name (buffer-substring-no-properties ,start ,end)))) (defmacro nxml-debug-set-inside (start end) (when nxml-debug `(let ((overlay (make-overlay ,start ,end))) (overlay-put overlay 'face '(:background "red")) (overlay-put overlay 'nxml-inside-debug t) (nxml-debug-change "nxml-set-inside" ,start ,end)))) (defmacro nxml-debug-clear-inside (start end) (when nxml-debug `(loop for overlay in (overlays-in ,start ,end) if (overlay-get overlay 'nxml-inside-debug) do (delete-overlay overlay) finally (nxml-debug-change "nxml-clear-inside" ,start ,end)))) (defun nxml-make-namespace (str) "Return a symbol for the namespace URI STR. STR must be a string. If STR is the empty string, return nil. Otherwise, return the symbol whose name is STR prefixed with a colon." (if (string-equal str "") nil (intern (concat ":" str)))) (defun nxml-namespace-name (ns) "Return the namespace URI corresponding to the symbol NS. This is the inverse of `nxml-make-namespace'." (and ns (substring (symbol-name ns) 1))) (defconst nxml-xml-namespace-uri (nxml-make-namespace "http://www.w3.org/XML/1998/namespace")) (defconst nxml-xmlns-namespace-uri (nxml-make-namespace "http://www.w3.org/2000/xmlns/")) (defmacro nxml-with-degradation-on-error (context &rest body) (if (not nxml-debug) (let ((error-symbol (make-symbol "err"))) `(condition-case ,error-symbol (progn ,@body) (error (nxml-degrade ,context ,error-symbol)))) `(progn ,@body))) (defmacro nxml-with-unmodifying-text-property-changes (&rest body) "Evaluate BODY without any text property changes modifying the buffer. Any text properties changes happen as usual but the changes are not treated as modifications to the buffer." (let ((modified (make-symbol "modified"))) `(let ((,modified (buffer-modified-p)) (inhibit-read-only t) (inhibit-modification-hooks t) (buffer-undo-list t) (deactivate-mark nil) ;; Apparently these avoid file locking problems. (buffer-file-name nil) (buffer-file-truename nil)) (unwind-protect (progn ,@body) (unless ,modified (restore-buffer-modified-p nil)))))) (put 'nxml-with-unmodifying-text-property-changes 'lisp-indent-function 0) (def-edebug-spec nxml-with-unmodifying-text-property-changes t) (defmacro nxml-with-invisible-motion (&rest body) "Evaluate body without calling any point motion hooks." `(let ((inhibit-point-motion-hooks t)) ,@body)) (put 'nxml-with-invisible-motion 'lisp-indent-function 0) (def-edebug-spec nxml-with-invisible-motion t) (defun nxml-display-file-parse-error (err) (let* ((filename (nth 1 err)) (buffer (find-file-noselect filename)) (pos (nth 2 err)) (message (nth 3 err))) (pop-to-buffer buffer) ;; What's the right thing to do if the buffer's modified? ;; The position in the saved file could be completely different. (goto-char (if (buffer-modified-p) 1 pos)) (error "%s" message))) (defun nxml-signal-file-parse-error (file pos message &optional error-symbol) (signal (or error-symbol 'nxml-file-parse-error) (list file pos message))) (put 'nxml-file-parse-error 'error-conditions '(error nxml-file-parse-error)) (put 'nxml-parse-file-error 'error-message "Error parsing file") (provide 'nxml-util) ;; arch-tag: 7d3b3af4-de2b-4410-bf67-94d64824324b ;;; nxml-util.el ends here