From 90edb3a743ab4e9fc18ff18844cc3624433cd3fc Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Mon, 29 Jul 2013 21:47:12 -0400
Subject: Update unit extraction regular expressions.

(bzr r12380.1.50)
---
 src/util/units.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/util/units.cpp')

diff --git a/src/util/units.cpp b/src/util/units.cpp
index 582c52090..342c9ff32 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -228,14 +228,14 @@ Quantity UnitTable::getQuantity(Glib::ustring const& q) const
     
     // Extract value
     double value = 0;
-    Glib::RefPtr<Glib::Regex> value_regex = Glib::Regex::create("\\d+\\.?\\d");
+    Glib::RefPtr<Glib::Regex> value_regex = Glib::Regex::create("[-+]*[\\d+]*\\.*[\\d+]*[eE]*[-+]*\\d+");
     if (value_regex->match(q, match_info)) {
         value = atof(match_info.fetch(0).c_str());
     }
     
     // Extract unit abbreviation
     Glib::ustring abbr;
-    Glib::RefPtr<Glib::Regex> unit_regex = Glib::Regex::create("[A-z]+");
+    Glib::RefPtr<Glib::Regex> unit_regex = Glib::Regex::create("[A-z%]+");
     if (unit_regex->match(q, match_info)) {
         abbr = match_info.fetch(0);
     }
-- 
cgit v1.2.3