Merge branch 'master' into unstable

Conflicts:
	README.md
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh

scripts/check-dependencies.sh

@@ -73,7 +73,7 @@ glib2_sysver()
   if [ ! -e $glib2path ]; then
     #No glib found
     #glib can be installed in /usr/lib/i386-linux-gnu/glib-2.0/ on arch i686-linux-gnu (sometimes?)
-    if [ $glib2archtriplet = "i686-linux-gnu" ]; then
+    if [ "$glib2archtriplet" = "i686-linux-gnu" ]; then
         glib2archtriplet=i386-linux-gnu
         glib2path=$1/lib/$glib2archtriplet/glib-2.0/include/glibconfig.h
         if [ ! -e $glib2path ]; then return; fi

scripts/uni-build-dependencies.sh

@@ -411,6 +411,48 @@ build_glew()
   GLEW_DEST=$DEPLOYDIR $MAKER install
 }
 
+build_gettext()
+{
+  version=$1
+  echo "Building gettext $version..."
+
+  cd "$BASEDIR"/src
+  rm -rf "gettext-$version"
+  if [ ! -f "glib-$version.tar.xz" ]; then
+    curl --insecure -LO "http://ftpmirror.gnu.org/gettext/gettext-$version.tar.gz"
+  fi
+  tar xzf "gettext-$version.tar.gz"
+  cd "gettext-$version"
+
+  ./configure --prefix="$DEPLOYDIR"
+  make -j4
+  make install
+}
+
+build_glib2()
+{
+  version="$1"
+  maj_min_version="${version%.*}" #Drop micro
+
+  if [ -e $DEPLOYDIR/lib/glib-2.0 ]; then
+    echo "glib2 already installed. not building"
+    return
+  fi
+
+  echo "Building glib2 $version..."
+  cd "$BASEDIR"/src
+  rm -rf "glib-$version"
+  if [ ! -f "glib-$version.tar.xz" ]; then
+    curl --insecure -LO "http://ftp.gnome.org/pub/gnome/sources/glib/$maj_min_version/glib-$version.tar.xz"
+  fi
+  tar xJf "glib-$version.tar.xz"
+  cd "glib-$version"
+
+  ./configure --disable-gtk-doc --disable-man --prefix="$DEPLOYDIR" CFLAGS="-I$DEPLOYDIR/include" LDFLAGS="-L$DEPLOYDIR/lib"
+  make -j$NUMCPU
+  make install
+}
+
 build_opencsg()
 {
   if [ -e $DEPLOYDIR/lib/libopencsg.so ]; then

scripts/uni-get-dependencies.sh

@@ -9,7 +9,7 @@ get_fedora_deps()
  yum install qt-devel bison flex eigen3-devel \
   boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \
   opencsg-devel git libXmu-devel curl imagemagick ImageMagick glib2-devel make \
-  xorg-x11-server-Xvfb
+  xorg-x11-server-Xvfb gettext
 }
 
 get_qomo_deps()
@@ -21,7 +21,7 @@ get_altlinux_deps()
 {
  for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \
   boost-thread-devel boost-system-devel boost-regex-devel eigen3 libmpfr libgmp libgmp_cxx-devel qt4-devel libcgal-devel git-core \
-  libglew-devel flex bison curl imagemagick glib2-devel; do apt-get install $i; done
+  libglew-devel flex bison curl imagemagick gettext glib2-devel; do apt-get install $i; done
 }
 
 get_freebsd_deps()
@@ -29,21 +29,21 @@ get_freebsd_deps()
  pkg_add -r bison boost-libs cmake git bash eigen3 flex gmake gmp mpfr \
   xorg libGLU libXmu libXi xorg-vfbserver glew \
   qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic \
-  opencsg cgal curl imagemagick glib2-devel
+  opencsg cgal curl imagemagick glib2-devel gettext
 }
 
 get_netbsd_deps()
 {
  pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
   qt4 glew cgal opencsg modular-xorg python27 curl \
-  imagemagick ImageMagick glib2-devel
+  imagemagick ImageMagick glib2-devel gettext
 }
 
 get_opensuse_deps()
 {
  zypper install libeigen3-devel mpfr-devel gmp-devel boost-devel \
   libqt4-devel glew-devel cmake git bison flex cgal-devel opencsg-devel curl \
-  glib2-devel
+  glib2-devel gettext
 }
 
 get_mageia_deps()
@@ -51,7 +51,7 @@ get_mageia_deps()
  urpmi ctags
  urpmi task-c-devel task-c++-devel libqt4-devel libgmp-devel \
   libmpfr-devel libboost-devel eigen3-devel libglew-devel bison flex \
-  cmake imagemagick glib2-devel python curl git x11-server-xvfb
+  cmake imagemagick glib2-devel python curl git x11-server-xvfb gettext
 }
 
 get_debian_deps()
@@ -60,7 +60,7 @@ get_debian_deps()
   libxmu-dev cmake bison flex git-core libboost-all-dev \
   libXi-dev libmpfr-dev libboost-dev libglew-dev \
   libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \
-  curl imagemagick libglib2.0-dev; do
+  curl imagemagick libglib2.0-dev gettext; do
    apt-get -y install $pkg;
  done
 }

src/lexer.l

@@ -149,7 +149,12 @@ use[ \t\r\n>]*"<"	{ BEGIN(cond_use); }
 
 {D}+{E}? | 
 {D}*\.{D}+{E}? |
-{D}+\.{D}*{E}?          { parserlval.number = boost::lexical_cast<double>(yytext); return TOK_NUMBER; }
+{D}+\.{D}*{E}?          {
+                            try {
+                                parserlval.number = boost::lexical_cast<double>(yytext);
+                                return TOK_NUMBER;
+                            } catch (boost::bad_lexical_cast) {}
+                        }
 "$"?[a-zA-Z0-9_]+       { parserlval.text = strdup(yytext); return TOK_ID; }
 
 \"			{ BEGIN(cond_string); stringcontents.clear(); }