summaryrefslogtreecommitdiff
path: root/lisp/textmodes/table.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/textmodes/table.el')
-rw-r--r--lisp/textmodes/table.el156
1 files changed, 54 insertions, 102 deletions
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index bed8b2fef27..1f185e0f216 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -590,7 +590,7 @@
;; attempt of implementing the table feature to Emacs. This greatly
;; motivated me to follow through to its completion.
;;
-;; Kenichi Handa <handa@etl.go.jp> kindly guided me through to
+;; Kenichi Handa <handa@gnu.org> kindly guided me through to
;; overcome many technical issues while I was struggling with quail
;; related internationalization problems.
;;
@@ -882,7 +882,7 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu
(push '(table-mode-indicator (table-fixed-width-mode " Fixed-Table" " Table"))
minor-mode-alist))
-(defconst table-source-languages '(html latex cals)
+(defconst table-source-languages '(html latex cals wiki mediawiki)
"Supported source languages.")
(defvar table-source-info-plist nil
"General storage for temporary information used while generating source.")
@@ -930,16 +930,16 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu
;; refill the table cache. If the command were not listed fast
;; typing can cause unwanted cache refill.
(defconst table-cell-bindings
- '(([(control i)] . table-forward-cell)
- ([(control I)] . table-backward-cell)
+ '(([(control ?i)] . table-forward-cell)
+ ([(control ?I)] . table-backward-cell)
([tab] . table-forward-cell)
([(shift backtab)] . table-backward-cell) ; for HPUX console keyboard
([(shift iso-lefttab)] . table-backward-cell) ; shift-tab on a microsoft natural keyboard and redhat linux
([(shift tab)] . table-backward-cell)
([backtab] . table-backward-cell) ; for terminals (e.g., xterm)
([return] . *table--cell-newline)
- ([(control m)] . *table--cell-newline)
- ([(control j)] . *table--cell-newline-and-indent)
+ ([(control ?m)] . *table--cell-newline)
+ ([(control ?j)] . *table--cell-newline-and-indent)
([mouse-3] . *table--present-cell-popup-menu)
([(control ?>)] . table-widen-cell)
([(control ?<)] . table-narrow-cell)
@@ -1202,35 +1202,13 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu
:help "Move point backward by cell(s)"])
))
-;; XEmacs causes an error when encountering unknown keywords in the
-;; menu definition. Specifically the :help keyword is new in Emacs 21
-;; and causes error for the XEmacs function `check-menu-syntax'. IMHO
-;; it is unwise to generate an error for unknown keywords because it
-;; kills the nice backward compatible extensibility of keyword use.
-;; Unknown keywords should be quietly ignore so that future extension
-;; does not cause a problem in the old implementation. Sigh...
-(when (featurep 'xemacs)
- (defun table--tweak-menu-for-xemacs (menu)
- (cond
- ((listp menu)
- (mapcar #'table--tweak-menu-for-xemacs menu))
- ((vectorp menu)
- (let ((len (length menu)))
- (dotimes (i len)
- ;; replace :help with something harmless.
- (if (eq (aref menu i) :help) (aset menu i :included)))))))
- (mapcar #'table--tweak-menu-for-xemacs
- (list table-global-menu table-cell-menu))
- (defvar mark-active t))
-
;; register table menu under global tools menu
(unless table-disable-menu
- (easy-menu-define table-global-menu-map nil "Table global menu" table-global-menu)
- (if (featurep 'xemacs)
- (progn
- (easy-menu-add-item nil '("Tools") table-global-menu-map))
- (easy-menu-add-item (current-global-map) '("menu-bar" "tools") "--")
- (easy-menu-add-item (current-global-map) '("menu-bar" "tools") table-global-menu-map)))
+ (easy-menu-define table-global-menu-map nil
+ "Table global menu" table-global-menu)
+ (easy-menu-add-item (current-global-map) '("menu-bar" "tools") "--")
+ (easy-menu-add-item (current-global-map)
+ '("menu-bar" "tools") table-global-menu-map))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
@@ -1310,8 +1288,8 @@ the last cache point coordinate."
;; set up the update timer unless it is explicitly inhibited.
(unless table-inhibit-update
(table--update-cell)))))
-(if (or (featurep 'xemacs)
- (null (fboundp 'font-lock-add-keywords))) nil
+(if (null (fboundp 'font-lock-add-keywords))
+ nil
;; Color it as a keyword.
(font-lock-add-keywords
'emacs-lisp-mode
@@ -2046,8 +2024,6 @@ plain text and loses all the table specific features."
(erase-buffer)
(table--insert-rectangle rectangle)))))
(restore-buffer-modified-p modified-flag))
- (if (featurep 'xemacs)
- (table--warn-incompatibility))
cell)))
;;;###autoload
@@ -3077,7 +3053,11 @@ CALS (DocBook DTD):
(table-put-source-info 'row-type (if (zerop table-cals-thead-rows) "tbody" "thead"))
(set-marker-insertion-type (table-get-source-info 'colspec-marker) nil) ;; insert after
(insert (format " <%s valign=\"top\">\n" (table-get-source-info 'row-type))))
- )))
+ ((eq language 'mediawiki)
+ (insert (format
+ "<!-- This HTML table template is generated by Emacs %s -->\n"
+ emacs-version))
+ (insert "{|\n")))))
(defun table--generate-source-epilogue (dest-buffer language _col-list _row-list)
"Generate and insert source epilogue into DEST-BUFFER."
@@ -3094,7 +3074,8 @@ CALS (DocBook DTD):
(dolist (col (sort (table-get-source-info 'colnum-list) '<))
(insert (format " <colspec colnum=\"%d\" colname=\"c%d\"/>\n" col col))))
(insert (format " </%s>\n </tgroup>\n</table>\n" (table-get-source-info 'row-type))))
- )))
+ ((eq language 'mediawiki)
+ (insert "|}\n")))))
(defun table--generate-source-scan-rows (dest-buffer language _origin-cell col-list row-list)
"Generate and insert source rows into DEST-BUFFER."
@@ -3106,7 +3087,11 @@ CALS (DocBook DTD):
(insert " <tr>\n"))
((eq language 'cals)
(insert " <row>\n"))
- ))
+ ((eq language 'wiki)
+ (insert "|"))
+ ((and (eq language 'mediawiki)
+ (> (table-get-source-info 'current-row) 1))
+ (insert "|-\n"))))
(table--generate-source-cells-in-a-row dest-buffer language col-list row-list)
(with-current-buffer dest-buffer
(cond
@@ -3116,7 +3101,9 @@ CALS (DocBook DTD):
(insert " </row>\n")
(unless (/= (table-get-source-info 'current-row) table-cals-thead-rows)
(insert (format " </%s>\n" (table-get-source-info 'row-type)))
- (insert (format " <%s valign=\"top\">\n" (table-put-source-info 'row-type "tbody")))))))
+ (insert (format " <%s valign=\"top\">\n" (table-put-source-info 'row-type "tbody")))))
+ ((eq language 'wiki)
+ (insert "|\n"))))
(table-put-source-info 'current-row (1+ (table-get-source-info 'current-row)))
(setq row-list (cdr row-list))))
@@ -3185,7 +3172,8 @@ CALS (DocBook DTD):
(not (memq valign '(top none))))
(insert " valign=\"" (symbol-name valign) "\""))
(insert ">\n"))
- ))
+ ((memq language '(wiki mediawiki))
+ (insert "|"))))
(table--generate-source-cell-contents dest-buffer language cell)
(with-current-buffer dest-buffer
(cond
@@ -3193,7 +3181,10 @@ CALS (DocBook DTD):
(insert (format" </%s>\n" (table-get-source-info 'cell-type))))
((eq language 'cals)
(insert " </entry>\n"))
- ))
+ ((eq language 'wiki)
+ (insert "|"))
+ ((eq language 'mediawiki)
+ (insert ?\n))))
(table-forward-cell 1 t)
(table-put-source-info 'current-column (table-get-source-info 'next-column))
))))
@@ -3232,11 +3223,12 @@ CALS (DocBook DTD):
(with-current-buffer dest-buffer
(let ((beg (point)))
(insert cell-contents)
- (indent-rigidly beg (point)
- (cond
- ((eq language 'html) 6)
- ((eq language 'cals) 10)))
- (insert ?\n)))))
+ (when (memq language '(html cals))
+ (indent-rigidly beg (point)
+ (cond
+ ((eq language 'html) 6)
+ ((eq language 'cals) 10)))
+ (insert ?\n))))))
(defun table--cell-horizontal-char-p (c)
"Test if character C is one of the horizontal characters"
@@ -3878,9 +3870,7 @@ converts a table into plain text without frames. It is a companion to
;; Add menu for table cells.
(unless table-disable-menu
(easy-menu-define table-cell-menu-map table-cell-map
- "Table cell menu" table-cell-menu)
- (if (featurep 'xemacs)
- (easy-menu-add table-cell-menu)))
+ "Table cell menu" table-cell-menu))
(run-hooks 'table-cell-map-hook))
;; Create the keymap after running the user init file so that the user
@@ -4093,7 +4083,7 @@ When the optional parameter NOW is nil it only sets up the update
timer. If it is non-nil the function copies the contents of the cell
cache buffer into the designated cell in the table buffer."
(if (null table-update-timer) nil
- (table--cancel-timer table-update-timer)
+ (cancel-timer table-update-timer)
(setq table-update-timer nil))
(if (or (not now)
(and (boundp 'quail-converting)
@@ -4136,7 +4126,7 @@ cache buffer into the designated cell in the table buffer."
(defun table--update-cell-widened (&optional now)
"Update the contents of the cells that are affected by widening operation."
(if (null table-widen-timer) nil
- (table--cancel-timer table-widen-timer)
+ (cancel-timer table-widen-timer)
(setq table-widen-timer nil))
(if (not now)
(setq table-widen-timer
@@ -4175,7 +4165,7 @@ cache buffer into the designated cell in the table buffer."
(defun table--update-cell-heightened (&optional now)
"Update the contents of the cells that are affected by heightening operation."
(if (null table-heighten-timer) nil
- (table--cancel-timer table-heighten-timer)
+ (cancel-timer table-heighten-timer)
(setq table-heighten-timer nil))
(if (not now)
(setq table-heighten-timer
@@ -4270,10 +4260,6 @@ cdr is the history symbol."
(read-from-minibuffer
(format "%s (default %s): " (car prompt-history) default)
"" nil nil (cdr prompt-history) default))
- (and (featurep 'xemacs)
- (equal (car (symbol-value (cdr prompt-history))) "")
- (set (cdr prompt-history)
- (cdr (symbol-value (cdr prompt-history)))))
(car (symbol-value (cdr prompt-history))))
(defun table--buffer-substring-and-trim (beg end)
@@ -4584,10 +4570,7 @@ of line."
(defun table--untabify (beg end)
"Wrapper to raw untabify."
- (untabify beg end)
- (if (featurep 'xemacs)
- ;; Cancel strange behavior of xemacs
- (message "")))
+ (untabify beg end))
(defun table--multiply-string (string multiplier)
"Multiply string and return it."
@@ -5208,9 +5191,7 @@ instead of the current buffer and returns the OBJECT."
(defun table--update-cell-face ()
"Update cell face according to the current mode."
- (if (featurep 'xemacs)
- (set-face-property 'table-cell 'underline table-fixed-width-mode)
- (set-face-inverse-video 'table-cell table-fixed-width-mode)))
+ (set-face-inverse-video 'table-cell table-fixed-width-mode))
(table--update-cell-face)
@@ -5263,27 +5244,12 @@ This feature is disabled when `table-disable-incompatibility-warning'
is non-nil. The warning is done only once per session for each item."
(unless (and table-disable-incompatibility-warning
(not (called-interactively-p 'interactive)))
- (cond ((and (featurep 'xemacs)
- (not (get 'table-disable-incompatibility-warning 'xemacs)))
- (put 'table-disable-incompatibility-warning 'xemacs t)
- (display-warning 'table
- "
-*** Warning ***
-
-Table package mostly works fine under XEmacs, however, due to the
-peculiar implementation of text property under XEmacs, cell splitting
-and any undo operation of table exhibit some known strange problems,
-such that a border characters dissolve into adjacent cells. Please be
-aware of this.
-
-"
- :warning))
- ((and (boundp 'flyspell-mode)
- flyspell-mode
- (not (get 'table-disable-incompatibility-warning 'flyspell)))
- (put 'table-disable-incompatibility-warning 'flyspell t)
- (display-warning 'table
- "
+ (when (and (boundp 'flyspell-mode)
+ flyspell-mode
+ (not (get 'table-disable-incompatibility-warning 'flyspell)))
+ (put 'table-disable-incompatibility-warning 'flyspell t)
+ (display-warning 'table
+ "
*** Warning ***
Flyspell minor mode is known to be incompatible with this table
@@ -5291,8 +5257,7 @@ package. The flyspell version 1.5d at URL `http://kaolin.unice.fr/~serrano'
works better than the previous versions however not fully compatible.
"
- :warning))
- )))
+ :warning))))
(defun table--cell-blank-str (&optional n)
"Return blank table cell string of length N."
@@ -5338,7 +5303,6 @@ Current buffer must already be set to the cache buffer."
(setq justify (or justify table-cell-info-justify))
(and justify
(not (eq justify 'left))
- (not (featurep 'xemacs))
(set-marker-insertion-type marker-point t))
(table--remove-eol-spaces (point-min) (point-max))
(if table-fixed-width-mode
@@ -5486,19 +5450,7 @@ It returns COLUMN unless STR contains some wide characters."
(defun table--set-timer (seconds func args)
"Generic wrapper for setting up a timer."
- (if (featurep 'xemacs)
- ;; the picky xemacs refuses to accept zero
- (add-timeout (if (zerop seconds) 0.01 seconds) func args nil)
- ;;(run-at-time seconds nil func args)))
- ;; somehow run-at-time causes strange problem under Emacs 20.7
- ;; this problem does not show up under Emacs 21.0.90
- (run-with-idle-timer seconds nil func args)))
-
-(defun table--cancel-timer (timer)
- "Generic wrapper for canceling a timer."
- (if (featurep 'xemacs)
- (disable-timeout timer)
- (cancel-timer timer)))
+ (run-with-idle-timer seconds nil func args))
(defun table--get-last-command ()
"Generic wrapper for getting the real last command."
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-30 13:41:31 +0000