emacs/lisp/nxml/rng-maint.el
Paul Eggert 476066e89d Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values.  Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete.  All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:33:57 -08:00

270 lines
8.5 KiB
EmacsLisp

;;; rng-maint.el --- commands for RELAX NG maintainers -*- lexical-binding:t -*-
;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: wp, hypermedia, languages, XML, RelaxNG
;; 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 <https://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
(require 'xmltok)
(require 'nxml-mode)
(require 'texnfo-upd)
(defvar rng-dir (file-name-directory load-file-name))
;;; Conversion from XML to texinfo.
;; This is all a hack and is just enough to make the conversion work.
;; It's not intended for public use.
(defvar rng-manual-base "nxml-mode")
(defvar rng-manual-xml (concat rng-manual-base ".xml"))
(defvar rng-manual-texi (concat rng-manual-base ".texi"))
(defvar rng-manual-info (concat rng-manual-base ".info"))
(defun rng-format-manual ()
"Create manual.texi from manual.xml."
(interactive)
(let ((xml-buf (find-file-noselect (expand-file-name rng-manual-xml
rng-dir)))
(texi-buf (find-file-noselect (expand-file-name rng-manual-texi
rng-dir))))
(with-current-buffer texi-buf
(erase-buffer)
(let ((standard-output texi-buf))
(princ (format "\\input texinfo @c -*- texinfo -*-\n\
@c %%**start of header\n\
@setfilename %s\n\
@settitle \n\
@c %%**end of header\n" rng-manual-info))
(set-buffer xml-buf)
(goto-char (point-min))
(xmltok-save
(xmltok-forward-prolog)
(rng-process-tokens))
(princ "\n@bye\n"))
(set-buffer texi-buf)
(rng-manual-fixup)
(texinfo-insert-node-lines (point-min) (point-max) t)
(texinfo-all-menus-update)
(save-buffer))))
(defun rng-manual-fixup ()
(goto-char (point-min))
(search-forward "@top ")
(let ((pos (point)))
(search-forward "\n")
(let ((title (buffer-substring-no-properties pos (1- (point)))))
(goto-char (point-min))
(search-forward "@settitle ")
(insert title)
(search-forward "@node")
(goto-char (match-beginning 0))
(insert "@dircategory Emacs\n"
"@direntry\n* "
title
": ("
rng-manual-info
").\n@end direntry\n\n"))))
(defvar rng-manual-inline-elements '(kbd key samp code var emph uref point))
(defun rng-process-tokens ()
(let ((section-depth 0)
;; stack of per-element space treatment
;; t means keep, nil means discard, fill means no blank lines
(keep-space-stack (list nil))
(ignore-following-newline nil)
(want-blank-line nil)
name startp endp data keep-space-for-children)
(while (xmltok-forward)
(cond ((memq xmltok-type '(start-tag empty-element end-tag))
(setq startp (memq xmltok-type '(start-tag empty-element)))
(setq endp (memq xmltok-type '(end-tag empty-element)))
(setq name (intern (if startp
(xmltok-start-tag-qname)
(xmltok-end-tag-qname))))
(setq keep-space-for-children nil)
(setq ignore-following-newline nil)
(cond ((memq name rng-manual-inline-elements)
(when startp
(when want-blank-line
(rng-manual-output-force-blank-line)
(when (eq want-blank-line 'noindent)
(princ "@noindent\n"))
(setq want-blank-line nil))
(setq keep-space-for-children t)
(princ (format "@%s{" name)))
(when endp (princ "}")))
((eq name 'ulist)
(when startp
(rng-manual-output-force-blank-line)
(setq want-blank-line nil)
(princ "@itemize @bullet\n"))
(when endp
(rng-manual-output-force-new-line)
(setq want-blank-line 'noindent)
(princ "@end itemize\n")))
((eq name 'item)
(rng-manual-output-force-new-line)
(setq want-blank-line endp)
(when startp (princ "@item\n")))
((memq name '(example display))
(when startp
(setq ignore-following-newline t)
(rng-manual-output-force-blank-line)
(setq want-blank-line nil)
(setq keep-space-for-children t)
(princ (format "@%s\n" name)))
(when endp
(rng-manual-output-force-new-line)
(setq want-blank-line 'noindent)
(princ (format "@end %s\n" name))))
((eq name 'para)
(rng-manual-output-force-new-line)
(when startp
(when want-blank-line
(setq want-blank-line t))
(setq keep-space-for-children 'fill))
(when endp (setq want-blank-line t)))
((eq name 'section)
(when startp
(rng-manual-output-force-blank-line)
(when (eq section-depth 0)
(princ "@node Top\n"))
(princ "@")
(princ (nth section-depth '(top
chapter
section
subsection
subsubsection)))
(princ " ")
(setq want-blank-line nil)
(setq section-depth (1+ section-depth)))
(when endp
(rng-manual-output-force-new-line)
(setq want-blank-line nil)
(setq section-depth (1- section-depth))))
((eq name 'title)
(when startp
(setq keep-space-for-children 'fill))
(when endp
(setq want-blank-line t)
(princ "\n"))))
(when startp
(setq keep-space-stack (cons keep-space-for-children
keep-space-stack)))
(when endp
(setq keep-space-stack (cdr keep-space-stack))))
((memq xmltok-type '(data
space
char-ref
entity-ref
cdata-section))
(setq data nil)
(cond ((memq xmltok-type '(data space))
(setq data (buffer-substring-no-properties xmltok-start
(point))))
((and (memq xmltok-type '(char-ref entity-ref))
xmltok-replacement)
(setq data xmltok-replacement))
((eq xmltok-type 'cdata-section)
(setq data
(buffer-substring-no-properties (+ xmltok-start 9)
(- (point) 3)))))
(when (and data (car keep-space-stack))
(setq data (replace-regexp-in-string "[@{}]"
"@\\&"
data
t))
(when ignore-following-newline
(setq data (replace-regexp-in-string "\\`\n" "" data t)))
(setq ignore-following-newline nil)
;; (when (eq (car keep-space-stack) 'fill)
;; (setq data (replace-regexp-in-string "\n" " " data t)))
(when (eq want-blank-line 'noindent)
(setq data (replace-regexp-in-string "\\`\n*" "" data t)))
(when (> (length data) 0)
(when want-blank-line
(rng-manual-output-force-blank-line)
(when (eq want-blank-line 'noindent)
(princ "@noindent\n"))
(setq want-blank-line nil))
(princ data))))
))))
(defun rng-manual-output-force-new-line ()
(with-current-buffer standard-output
(unless (eq (char-before) ?\n)
(insert ?\n))))
(defun rng-manual-output-force-blank-line ()
(with-current-buffer standard-output
(if (eq (char-before) ?\n)
(unless (eq (char-before (1- (point))) ?\n)
(insert ?\n))
(insert "\n\n"))))
;;; Timing
(defun rng-time-function (function &rest args)
(let* ((start (current-time))
(val (apply function args)))
(message "%s ran in %g seconds"
function (float-time (time-since start)))
val))
(defun rng-time-tokenize-buffer ()
(interactive)
(rng-time-function 'rng-tokenize-buffer))
(defun rng-tokenize-buffer ()
(save-excursion
(goto-char (point-min))
(xmltok-save
(xmltok-forward-prolog)
(while (xmltok-forward)))))
(defun rng-time-validate-buffer ()
(interactive)
(rng-time-function 'rng-validate-buffer))
(defvar rng-error-count)
(defvar rng-validate-up-to-date-end)
(declare-function rng-clear-cached-state "rng-valid" (start end))
(declare-function rng-clear-overlays "rng-valid" (beg end))
(declare-function rng-clear-conditional-region "rng-valid" ())
(declare-function rng-do-some-validation "rng-valid"
(&optional continue-p-function))
(defun rng-validate-buffer ()
(save-restriction
(widen)
(with-silent-modifications
(rng-clear-cached-state (point-min) (point-max)))
;; 1+ to clear empty overlays at (point-max)
(rng-clear-overlays (point-min) (1+ (point-max))))
(setq rng-validate-up-to-date-end 1)
(rng-clear-conditional-region)
(setq rng-error-count 0)
(while (rng-do-some-validation
(lambda () t))))
;;; rng-maint.el ends here