2001-07-16 12:23:00 +00:00
|
|
|
|
;;; delim-col.el --- prettify all columns in a region or rectangle
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
2004-03-10 00:47:45 +00:00
|
|
|
|
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
|
|
|
|
|
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
|
2001-07-16 12:23:00 +00:00
|
|
|
|
;; Version: 2.1
|
|
|
|
|
;; Keywords: internal
|
2006-09-20 18:49:34 +00:00
|
|
|
|
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1999-10-15 16:53:35 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
1999-10-15 16:53:35 +00:00
|
|
|
|
;; 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.
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
1999-10-15 16:53:35 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; delim-col helps to prettify columns in a text region or rectangle.
|
|
|
|
|
;;
|
|
|
|
|
;; To use it, make sure that this file is in load-path and insert in your
|
|
|
|
|
;; .emacs:
|
|
|
|
|
;;
|
|
|
|
|
;; (require 'delim-col)
|
|
|
|
|
;;
|
|
|
|
|
;; If you have, for example, the following columns:
|
|
|
|
|
;;
|
|
|
|
|
;; a b c d
|
|
|
|
|
;; aaaa bb ccc ddddd
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; aaa bbb cccc dddd
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;; aa bb ccccccc ddd
|
|
|
|
|
;;
|
|
|
|
|
;; And the following settings:
|
|
|
|
|
;;
|
|
|
|
|
;; (setq delimit-columns-str-before "[ ")
|
|
|
|
|
;; (setq delimit-columns-str-after " ]")
|
|
|
|
|
;; (setq delimit-columns-str-separator ", ")
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; (setq delimit-columns-before "")
|
|
|
|
|
;; (setq delimit-columns-after "")
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;; (setq delimit-columns-separator "\t")
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; (setq delimit-columns-format 'separator)
|
|
|
|
|
;; (setq delimit-columns-extra t)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;;
|
|
|
|
|
;; If you select the lines above and type:
|
|
|
|
|
;;
|
|
|
|
|
;; M-x delimit-columns-region RET
|
|
|
|
|
;;
|
|
|
|
|
;; You obtain the following result:
|
|
|
|
|
;;
|
|
|
|
|
;; [ a , b , c , d ]
|
|
|
|
|
;; [ aaaa, bb , ccc , ddddd ]
|
|
|
|
|
;; [ aaa , bbb, cccc , dddd ]
|
|
|
|
|
;; [ aa , bb , ccccccc, ddd ]
|
|
|
|
|
;;
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; But if you select start from the very first b to the very last c and type:
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;;
|
|
|
|
|
;; M-x delimit-columns-rectangle RET
|
|
|
|
|
;;
|
|
|
|
|
;; You obtain the following result:
|
|
|
|
|
;;
|
|
|
|
|
;; a [ b , c ] d
|
|
|
|
|
;; aaaa [ bb , ccc ] ddddd
|
|
|
|
|
;; aaa [ bbb, cccc ] dddd
|
|
|
|
|
;; aa [ bb , ccccccc ] ddd
|
|
|
|
|
;;
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; Now, if we change settings to:
|
|
|
|
|
;;
|
|
|
|
|
;; (setq delimit-columns-before "<")
|
|
|
|
|
;; (setq delimit-columns-after ">")
|
|
|
|
|
;;
|
|
|
|
|
;; For the `delimit-columns-region' example above, the result is:
|
|
|
|
|
;;
|
|
|
|
|
;; [ <a> , <b> , <c> , <d> ]
|
|
|
|
|
;; [ <aaaa>, <bb> , <ccc> , <ddddd> ]
|
|
|
|
|
;; [ <aaa> , <bbb>, <cccc> , <dddd> ]
|
|
|
|
|
;; [ <aa> , <bb> , <ccccccc>, <ddd> ]
|
|
|
|
|
;;
|
|
|
|
|
;; And for the `delimit-columns-rectangle' example above, the result is:
|
|
|
|
|
;;
|
|
|
|
|
;; a [ <b> , <c> ] d
|
|
|
|
|
;; aaaa [ <bb> , <ccc> ] ddddd
|
|
|
|
|
;; aaa [ <bbb>, <cccc> ] dddd
|
|
|
|
|
;; aa [ <bb> , <ccccccc> ] ddd
|
|
|
|
|
;;
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;; Note that `delimit-columns-region' operates over all text region
|
|
|
|
|
;; selected, extending the region start to the beginning of line and the
|
|
|
|
|
;; region end to the end of line. While `delimit-columns-rectangle'
|
|
|
|
|
;; operates over the text rectangle selected which rectangle diagonal is
|
|
|
|
|
;; given by the region start and end.
|
|
|
|
|
;;
|
2011-12-12 05:32:49 +00:00
|
|
|
|
;; See `delimit-columns-format' variable documentation for column formatting.
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;;
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;; `delimit-columns-region' is useful when you have columns of text that
|
|
|
|
|
;; are not well aligned, like:
|
|
|
|
|
;;
|
|
|
|
|
;; horse apple bus
|
|
|
|
|
;; dog pineapple car
|
|
|
|
|
;; porcupine strawberry airplane
|
|
|
|
|
;;
|
|
|
|
|
;; `delimit-columns-region' and `delimit-columns-rectangle' handle lines
|
|
|
|
|
;; with different number of columns, like:
|
|
|
|
|
;;
|
|
|
|
|
;; horse apple bus
|
|
|
|
|
;; dog pineapple car EXTRA
|
|
|
|
|
;; porcupine strawberry airplane
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Use `delimit-columns-customize' to customize delim-col package variables.
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;; User Options:
|
|
|
|
|
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(defgroup columns nil
|
2005-07-04 01:53:04 +00:00
|
|
|
|
"Prettify columns."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:link '(emacs-library-link :tag "Source Lisp File" "delim-col.el")
|
|
|
|
|
:prefix "delimit-columns-"
|
2010-02-16 14:35:45 +00:00
|
|
|
|
:group 'wp)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-str-before ""
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a string to be inserted before all columns."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(string :tag "Before All Columns")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-str-separator ", "
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a string to be inserted between each column."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(string :tag "Between Each Column")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-str-after ""
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a string to be inserted after all columns."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(string :tag "After All Columns")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-before ""
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a string to be inserted before each column."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(string :tag "Before Each Column")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-after ""
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a string to be inserted after each column."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(string :tag "After Each Column")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-separator "\t"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify a regexp which separates each column."
|
2000-10-24 21:17:06 +00:00
|
|
|
|
:type '(regexp :tag "Column Separator")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-format t
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify how to format columns.
|
2000-10-24 21:17:06 +00:00
|
|
|
|
|
|
|
|
|
For examples below, consider:
|
|
|
|
|
|
|
|
|
|
+ columns `ccc' and `dddd',
|
|
|
|
|
+ the maximum column length for each column is 6,
|
|
|
|
|
+ and the following settings:
|
|
|
|
|
(setq delimit-columns-before \"<\")
|
|
|
|
|
(setq delimit-columns-after \">\")
|
|
|
|
|
(setq delimit-columns-separator \":\")
|
|
|
|
|
|
|
|
|
|
Valid values are:
|
|
|
|
|
|
2011-12-12 05:32:49 +00:00
|
|
|
|
nil no formatting. That is, `delimit-columns-after' is followed by
|
2000-10-24 21:17:06 +00:00
|
|
|
|
`delimit-columns-separator'.
|
|
|
|
|
For example, the result is: \"<ccc>:<dddd>:\"
|
|
|
|
|
|
|
|
|
|
t align columns. That is, `delimit-columns-after' is followed by
|
|
|
|
|
`delimit-columns-separator' and then followed by spaces.
|
|
|
|
|
For example, the result is: \"<ccc>: <dddd>: \"
|
|
|
|
|
|
|
|
|
|
'separator align separators. That is, `delimit-columns-after' is followed
|
|
|
|
|
by spaces and then followed by `delimit-columns-separator'.
|
|
|
|
|
For example, the result is: \"<ccc> :<dddd> :\"
|
|
|
|
|
|
|
|
|
|
'padding format column by filling with spaces before
|
|
|
|
|
`delimit-columns-after'. That is, spaces are followed by
|
|
|
|
|
`delimit-columns-after' and then followed by
|
|
|
|
|
`delimit-columns-separator'.
|
|
|
|
|
For example, the result is: \"<ccc >:<dddd >:\"
|
|
|
|
|
|
|
|
|
|
Any other value is treated as t."
|
2011-12-12 05:32:49 +00:00
|
|
|
|
:type '(choice :menu-tag "Column Formatting"
|
|
|
|
|
:tag "Column Formatting"
|
|
|
|
|
(const :tag "No Formatting" nil)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(const :tag "Column Alignment" t)
|
2011-11-09 06:10:51 +00:00
|
|
|
|
(const :tag "Separator Alignment" separator)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(const :tag "Column Padding" padding))
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-extra t
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Non-nil means that lines will have the same number of columns.
|
2000-10-24 21:17:06 +00:00
|
|
|
|
|
|
|
|
|
This has effect only when there are lines with different number of columns."
|
|
|
|
|
:type '(boolean :tag "Lines With Same Number Of Column")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-start 0
|
2011-12-04 08:02:42 +00:00
|
|
|
|
"Specify column number to start prettifying.
|
2000-10-24 21:17:06 +00:00
|
|
|
|
|
|
|
|
|
See also `delimit-columns-end' for documentation.
|
|
|
|
|
|
|
|
|
|
The following relation must hold:
|
|
|
|
|
0 <= delimit-columns-start <= delimit-columns-end
|
|
|
|
|
|
|
|
|
|
The column number start from 0 and it's relative to the beginning of selected
|
|
|
|
|
region. So if you selected a text region, the first column (column 0) is
|
|
|
|
|
located at beginning of line. If you selected a text rectangle, the first
|
|
|
|
|
column (column 0) is located at left corner."
|
|
|
|
|
:type '(integer :tag "Column Start")
|
|
|
|
|
:group 'columns)
|
|
|
|
|
|
|
|
|
|
(defcustom delimit-columns-end 1000000
|
2011-12-04 08:02:42 +00:00
|
|
|
|
"Specify column number to end prettifying.
|
2000-10-24 21:17:06 +00:00
|
|
|
|
|
|
|
|
|
See also `delimit-columns-start' for documentation.
|
|
|
|
|
|
|
|
|
|
The following relation must hold:
|
|
|
|
|
0 <= delimit-columns-start <= delimit-columns-end
|
|
|
|
|
|
|
|
|
|
The column number start from 0 and it's relative to the beginning of selected
|
|
|
|
|
region. So if you selected a text region, the first column (column 0) is
|
|
|
|
|
located at beginning of line. If you selected a text rectangle, the first
|
|
|
|
|
column (column 0) is located at left corner."
|
|
|
|
|
:type '(integer :tag "Column End")
|
|
|
|
|
:group 'columns)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;; User Commands:
|
|
|
|
|
|
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
;; to avoid compilation gripes
|
|
|
|
|
(defvar delimit-columns-max nil)
|
|
|
|
|
(defvar delimit-columns-limit nil)
|
|
|
|
|
|
|
|
|
|
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun delimit-columns-customize ()
|
|
|
|
|
"Customization of `columns' group."
|
|
|
|
|
(interactive)
|
|
|
|
|
(customize-group 'columns))
|
|
|
|
|
|
|
|
|
|
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(defmacro delimit-columns-str (str)
|
|
|
|
|
`(if (stringp ,str) ,str ""))
|
|
|
|
|
|
|
|
|
|
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun delimit-columns-region (start end)
|
|
|
|
|
"Prettify all columns in a text region.
|
|
|
|
|
|
|
|
|
|
START and END delimits the text region."
|
|
|
|
|
(interactive "*r")
|
|
|
|
|
(let ((delimit-columns-str-before
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-before))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-str-separator
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-separator))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-str-after
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-after))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-before
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-before))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-after
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-after))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-start
|
|
|
|
|
(if (and (integerp delimit-columns-start)
|
|
|
|
|
(>= delimit-columns-start 0))
|
|
|
|
|
delimit-columns-start
|
|
|
|
|
0))
|
|
|
|
|
(delimit-columns-end
|
|
|
|
|
(if (integerp delimit-columns-end)
|
|
|
|
|
delimit-columns-end
|
|
|
|
|
1000000))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-limit (make-marker))
|
|
|
|
|
(the-end (copy-marker end))
|
|
|
|
|
delimit-columns-max)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(when (<= delimit-columns-start delimit-columns-end)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(save-excursion
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(goto-char start)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
;; get maximum length for each column
|
2000-10-30 12:14:11 +00:00
|
|
|
|
(and delimit-columns-format
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(while (< (point) the-end)
|
|
|
|
|
(delimit-columns-rectangle-max
|
|
|
|
|
(prog1
|
|
|
|
|
(point)
|
|
|
|
|
(end-of-line)))
|
|
|
|
|
(forward-char 1))))
|
|
|
|
|
;; prettify columns
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(while (< (point) the-end)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-rectangle-line
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(prog1
|
|
|
|
|
(point)
|
|
|
|
|
(end-of-line)))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(forward-char 1))
|
|
|
|
|
;; nullify markers
|
|
|
|
|
(set-marker delimit-columns-limit nil)
|
|
|
|
|
(set-marker the-end nil)))))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(require 'rect)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun delimit-columns-rectangle (start end)
|
|
|
|
|
"Prettify all columns in a text rectangle.
|
|
|
|
|
|
|
|
|
|
START and END delimits the corners of text rectangle."
|
|
|
|
|
(interactive "*r")
|
|
|
|
|
(let ((delimit-columns-str-before
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-before))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-str-separator
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-separator))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-str-after
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-str-after))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-before
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-before))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-after
|
2000-10-31 11:57:12 +00:00
|
|
|
|
(delimit-columns-str delimit-columns-after))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-start
|
|
|
|
|
(if (and (integerp delimit-columns-start)
|
|
|
|
|
(>= delimit-columns-start 0))
|
|
|
|
|
delimit-columns-start
|
|
|
|
|
0))
|
|
|
|
|
(delimit-columns-end
|
|
|
|
|
(if (integerp delimit-columns-end)
|
|
|
|
|
delimit-columns-end
|
|
|
|
|
1000000))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delimit-columns-limit (make-marker))
|
|
|
|
|
(the-end (copy-marker end))
|
|
|
|
|
delimit-columns-max)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(when (<= delimit-columns-start delimit-columns-end)
|
|
|
|
|
;; get maximum length for each column
|
2000-10-30 12:14:11 +00:00
|
|
|
|
(and delimit-columns-format
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(operate-on-rectangle 'delimit-columns-rectangle-max
|
|
|
|
|
start the-end nil)))
|
|
|
|
|
;; prettify columns
|
|
|
|
|
(save-excursion
|
|
|
|
|
(operate-on-rectangle 'delimit-columns-rectangle-line
|
|
|
|
|
start the-end nil))
|
|
|
|
|
;; nullify markers
|
|
|
|
|
(set-marker delimit-columns-limit nil)
|
|
|
|
|
(set-marker the-end nil))))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;; Internal Variables and Functions:
|
|
|
|
|
|
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defun delimit-columns-rectangle-max (startpos &optional _ignore1 _ignore2)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(set-marker delimit-columns-limit (point))
|
|
|
|
|
(goto-char startpos)
|
|
|
|
|
(let ((ncol 1)
|
|
|
|
|
origin values)
|
|
|
|
|
;; get current column length
|
|
|
|
|
(while (progn
|
|
|
|
|
(setq origin (current-column))
|
|
|
|
|
(re-search-forward delimit-columns-separator
|
|
|
|
|
delimit-columns-limit 'move))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(setq values (cons (- (current-column) origin)
|
|
|
|
|
values)))
|
|
|
|
|
(setq ncol (1+ ncol)))
|
|
|
|
|
(setq values (cons (- (current-column) origin)
|
|
|
|
|
values))
|
|
|
|
|
;; extend delimit-columns-max, if needed
|
|
|
|
|
(let ((index (length delimit-columns-max)))
|
|
|
|
|
(and (> ncol index)
|
|
|
|
|
(let ((extend (make-vector ncol 0)))
|
|
|
|
|
(while (> index 0)
|
|
|
|
|
(setq index (1- index))
|
|
|
|
|
(aset extend index (aref delimit-columns-max index)))
|
|
|
|
|
(setq delimit-columns-max extend))))
|
|
|
|
|
;; get maximum column length
|
|
|
|
|
(while values
|
|
|
|
|
(setq ncol (1- ncol))
|
|
|
|
|
(aset delimit-columns-max ncol (max (aref delimit-columns-max ncol)
|
|
|
|
|
(car values)))
|
|
|
|
|
(setq values (cdr values)))))
|
|
|
|
|
|
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defun delimit-columns-rectangle-line (startpos &optional _ignore1 _ignore2)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(let ((len (length delimit-columns-max))
|
|
|
|
|
(ncol 0)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
origin)
|
|
|
|
|
(set-marker delimit-columns-limit (point))
|
|
|
|
|
(goto-char startpos)
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; skip initial columns
|
|
|
|
|
(while (and (< ncol delimit-columns-start)
|
|
|
|
|
(< (point) delimit-columns-limit)
|
|
|
|
|
(re-search-forward delimit-columns-separator
|
|
|
|
|
delimit-columns-limit 'move))
|
|
|
|
|
(setq ncol (1+ ncol)))
|
2011-12-12 05:32:49 +00:00
|
|
|
|
;; insert first formatting
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(insert delimit-columns-str-before delimit-columns-before)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
;; Adjust all columns but last one
|
|
|
|
|
(while (progn
|
|
|
|
|
(setq origin (current-column))
|
|
|
|
|
(and (< (point) delimit-columns-limit)
|
|
|
|
|
(re-search-forward delimit-columns-separator
|
2000-10-24 21:17:06 +00:00
|
|
|
|
delimit-columns-limit 'move)
|
|
|
|
|
(or (< ncol delimit-columns-end)
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
nil))))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(delete-region (match-beginning 0) (point))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(delimit-columns-format
|
|
|
|
|
(and delimit-columns-format
|
|
|
|
|
(make-string (- (aref delimit-columns-max ncol)
|
1999-09-19 21:17:17 +00:00
|
|
|
|
(- (current-column) origin))
|
2005-07-04 01:53:04 +00:00
|
|
|
|
?\s)))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(setq ncol (1+ ncol)))
|
|
|
|
|
;; Prepare last column spaces
|
|
|
|
|
(let ((spaces (and delimit-columns-format
|
|
|
|
|
(make-string (- (aref delimit-columns-max ncol)
|
|
|
|
|
(- (current-column) origin))
|
2005-07-04 01:53:04 +00:00
|
|
|
|
?\s))))
|
2000-10-24 21:17:06 +00:00
|
|
|
|
;; Adjust extra columns, if needed
|
|
|
|
|
(and delimit-columns-extra
|
|
|
|
|
(while (and (< (setq ncol (1+ ncol)) len)
|
|
|
|
|
(<= ncol delimit-columns-end))
|
|
|
|
|
(delimit-columns-format spaces)
|
|
|
|
|
(setq spaces (and delimit-columns-format
|
|
|
|
|
(make-string (aref delimit-columns-max ncol)
|
2005-07-04 01:53:04 +00:00
|
|
|
|
?\s)))))
|
2011-12-12 05:32:49 +00:00
|
|
|
|
;; insert last formatting
|
2000-10-24 21:17:06 +00:00
|
|
|
|
(cond ((null delimit-columns-format)
|
|
|
|
|
(insert delimit-columns-after delimit-columns-str-after))
|
|
|
|
|
((eq delimit-columns-format 'padding)
|
|
|
|
|
(insert spaces delimit-columns-after delimit-columns-str-after))
|
|
|
|
|
(t
|
|
|
|
|
(insert delimit-columns-after spaces delimit-columns-str-after))
|
|
|
|
|
))
|
|
|
|
|
(goto-char (max (point) delimit-columns-limit))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun delimit-columns-format (spaces)
|
|
|
|
|
(cond ((null delimit-columns-format)
|
|
|
|
|
(insert delimit-columns-after
|
|
|
|
|
delimit-columns-str-separator
|
|
|
|
|
delimit-columns-before))
|
|
|
|
|
((eq delimit-columns-format 'separator)
|
|
|
|
|
(insert delimit-columns-after
|
|
|
|
|
spaces
|
|
|
|
|
delimit-columns-str-separator
|
|
|
|
|
delimit-columns-before))
|
|
|
|
|
((eq delimit-columns-format 'padding)
|
|
|
|
|
(insert spaces
|
|
|
|
|
delimit-columns-after
|
|
|
|
|
delimit-columns-str-separator
|
|
|
|
|
delimit-columns-before))
|
|
|
|
|
(t
|
|
|
|
|
(insert delimit-columns-after
|
|
|
|
|
delimit-columns-str-separator
|
|
|
|
|
spaces
|
|
|
|
|
delimit-columns-before))
|
|
|
|
|
))
|
1999-09-19 21:17:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'delim-col)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; delim-col.el ends here
|