|
|
@@ -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]+\\|nan\\)$"
|
|
|
"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.
|
|
|
@@ -131,14 +131,14 @@ Other options offered by the customize interface are more restrictive."
|
|
|
(const :tag "Integers"
|
|
|
"^[-+]?[0-9]+$")
|
|
|
(const :tag "Floating Point Numbers"
|
|
|
- "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$")
|
|
|
+ "^[-+]?\\([0-9]*[.,][0-9]+\\|[0-9]+[.,][0-9]*\\)$")
|
|
|
(const :tag "Floating Point Number or Integer"
|
|
|
- "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$")
|
|
|
+ "^[-+]?\\([0-9]*[.,][0-9]+\\|[0-9]+[.,]?[0-9]*\\)$")
|
|
|
(const :tag "Exponential, Floating point, Integer"
|
|
|
- "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
|
|
|
+ "^[-+]?[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\\)$")
|
|
|
- (string :tag "Regexp:")))
|
|
|
+ "^\\([<>]?[-+^.,0-9]*[0-9][-+^.,0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$")
|
|
|
+ (regexp :tag "Regexp:")))
|
|
|
|
|
|
(defcustom org-table-number-fraction 0.5
|
|
|
"Fraction of numbers in a column required to make the column align right.
|
Bastien Guerry