diff options
author | Michael Brand <michael.ch.brand@gmail.com> | 2012-12-28 15:00:03 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-12-29 14:33:52 +0100 |
commit | 0ce406151f2559ddc6bbdb7e4ccbae9e5742f45a (patch) | |
tree | 5af2b8b22a08b9a714d2caff34befbb28207e198 | |
parent | ce1a8465b5261b4c678489fc443bdcacecdf7e96 (diff) | |
download | org-mode-0ce406151f2559ddc6bbdb7e4ccbae9e5742f45a.tar.gz |
Extend org-table-number-regexp
* lisp/org-table.el (org-table-number-regexp): Extend 0x hex to
fixed-point number, add <radix>#<number>, add Calc infinite numbers
uinf, -inf and inf.
* testing/lisp/test-org-table.el (test-org-table/align): Adapt
alignment.
-rw-r--r-- | lisp/org-table.el | 10 | ||||
-rw-r--r-- | testing/lisp/test-org-table.el | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index 509a1ef..6a9d0b4 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -112,7 +112,7 @@ table, obtained by prompting the user." :type 'string) (defcustom org-table-number-regexp - "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$" + "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$" "Regular expression for recognizing numbers in table columns. If a table column contains mostly numbers, it will be aligned to the right. If not, it will be aligned to the left. @@ -136,10 +136,10 @@ Other options offered by the customize interface are more restrictive." "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$") (const :tag "Exponential, Floating point, Integer" "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$") - (const :tag "Very General Number-Like, including hex" - "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$") - (const :tag "Very General Number-Like, including hex, allows comma as decimal mark" - "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$") + (const :tag "Very General Number-Like, including hex and Calc radix" + "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") + (const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark" + "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") (string :tag "Regexp:"))) (defcustom org-table-number-fraction 0.5 diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el index 4c899a8..89704ff 100644 --- a/testing/lisp/test-org-table.el +++ b/testing/lisp/test-org-table.el @@ -32,9 +32,9 @@ | ab | ab | ab | ab | ab | ab | ab | ab | ") (org-test-table-target-expect " -| 0 | 0 | 0 | 0 | 0 | 0 | +| 0 | 0 | 0 | 0 | 0 | 0 | | <-0x0ab.cf | >-36#0vw.yz | nan | uinf | -inf | inf | -| ab | ab | ab | ab | ab | ab | +| ab | ab | ab | ab | ab | ab | ")) (ert-deftest test-org-table/org-table-convert-refs-to-an/1 () |