[gmsh] 02/07: Merge.

Anton Gladky gladk at moszumanska.debian.org
Wed Aug 26 20:50:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gmsh.

commit 71b46f39ca917adb5fe3a932f2c921f0e3dab2e9
Merge: 4c450d1 90ca918
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Aug 26 22:36:14 2015 +0200

    Merge.

 CMakeLists.txt                                  |   218 +-
 Common/CMakeLists.txt                           |     7 +-
 Common/CommandLine.cpp                          |    45 +-
 Common/Context.h                                |    14 +-
 Common/DefaultOptions.h                         |    47 +-
 Common/Gmsh.cpp                                 |    34 +-
 Common/GmshMessage.cpp                          |   109 +-
 Common/GmshMessage.h                            |    19 +-
 Common/GmshSocket.h                             |     8 +-
 Common/OS.cpp                                   |    58 +-
 Common/OS.h                                     |     1 +
 Common/OpenFile.cpp                             |    11 +-
 Common/Options.cpp                              |   111 +-
 Common/Options.h                                |    16 +-
 Common/SmoothData.cpp                           |     4 +-
 Common/SmoothData.h                             |    18 +-
 Common/gmshLocalNetworkClient.cpp               |    74 +-
 Common/onelab.h                                 |    15 +-
 Common/onelabUtils.cpp                          |    22 +-
 Common/rtree.h                                  |     4 +
 Fltk/FlGui.cpp                                  |     9 +-
 Fltk/FlGui.h                                    |     4 +
 Fltk/clippingWindow.cpp                         |     1 +
 Fltk/drawContextFltkStringTexture.cpp           |     7 +-
 Fltk/fileDialogs.cpp                            |     3 +-
 Fltk/graphicWindow.cpp                          |    91 +-
 Fltk/helpWindow.cpp                             |     3 +-
 Fltk/onelab2Group.cpp                           |    85 +-
 Fltk/onelab2Group.h                             |     4 +-
 Fltk/onelabGroup.cpp                            |   115 +-
 Fltk/onelabGroup.h                              |     3 +-
 Fltk/openglWindow.cpp                           |    98 +-
 Fltk/openglWindow.h                             |     8 +-
 Fltk/optionWindow.cpp                           |     1 +
 Fltk/pluginWindow.cpp                           |     3 +-
 Fltk/visibilityWindow.cpp                       |    35 +-
 Geo/GEdge.cpp                                   |    78 +-
 Geo/GEdge.h                                     |    14 +-
 Geo/GEntity.cpp                                 |    68 +-
 Geo/GEntity.h                                   |    18 +-
 Geo/GFace.cpp                                   |   401 +
 Geo/GFace.h                                     |    12 +-
 Geo/GFaceCompound.cpp                           |    10 +
 Geo/GModel.cpp                                  |    12 +-
 Geo/GModel.h                                    |     1 +
 Geo/GModelFactory.cpp                           |    35 +-
 Geo/GModelIO_GEO.cpp                            |    68 +-
 Geo/GModelIO_MSH.cpp                            |    62 +-
 Geo/GModelIO_MSH2.cpp                           |    10 +-
 Geo/GRegion.cpp                                 |     3 +-
 Geo/GenericFace.cpp                             |    14 +-
 Geo/Geo.cpp                                     |    71 +-
 Geo/Geo.h                                       |    26 +-
 Geo/MElement.cpp                                |     9 -
 Geo/MElement.h                                  |     1 -
 Geo/MElementOctree.cpp                          |     2 +-
 Geo/MElementOctree.h                            |     3 +-
 Geo/MVertex.h                                   |     8 +-
 Geo/SOrientedBoundingBox.cpp                    |    99 +-
 Geo/SOrientedBoundingBox.h                      |    11 +-
 Geo/gmshEdge.cpp                                |     6 +-
 Geo/gmshFace.cpp                                |     6 +-
 Geo/gmshLevelset.cpp                            |    21 +-
 Graphics/drawAxes.cpp                           |    17 +-
 Graphics/drawContext.cpp                        |    90 +-
 Graphics/drawContext.h                          |    24 +-
 Graphics/drawGeom.cpp                           |     8 +-
 Graphics/drawGlyph.cpp                          |   156 +-
 Graphics/drawGraph2d.cpp                        |    35 +-
 Graphics/drawMesh.cpp                           |    10 +-
 Graphics/drawPost.cpp                           |    34 +-
 Graphics/drawScales.cpp                         |    23 +-
 Mesh/BackgroundMesh2D.cpp                       |    98 +-
 Mesh/BackgroundMesh2D.h                         |   180 +-
 Mesh/BackgroundMesh3D.cpp                       |    36 +
 Mesh/Field.h                                    |    12 +-
 Mesh/Generator.cpp                              |    10 +-
 Mesh/meshGEdge.cpp                              |    17 +-
 Mesh/meshGFace.cpp                              |   383 +-
 Mesh/meshGRegionLocalMeshMod.cpp                |    12 +-
 Mesh/pointInsertionRTreeTools.h                 |    90 +-
 Numeric/fullMatrix.h                            |     2 +-
 Parser/FunctionManager.cpp                      |    10 +
 Parser/FunctionManager.h                        |     1 +
 Parser/Gmsh.l                                   |    12 +-
 Parser/Gmsh.tab.cpp                             | 10719 +++++++++++++++-------
 Parser/Gmsh.tab.hpp                             |   232 +-
 Parser/Gmsh.y                                   |   582 +-
 Parser/Gmsh.yy.cpp                              |  1394 ++-
 Plugin/Annotate.cpp                             |    32 +-
 Plugin/CutBox.cpp                               |    76 +-
 Plugin/CutGrid.cpp                              |    39 +-
 Plugin/Distance.cpp                             |    17 +-
 Plugin/FaultZone.cpp                            |    10 +-
 Plugin/HarmonicToTime.cpp                       |    20 +-
 Plugin/MathEval.cpp                             |     2 +-
 Post/PViewData.h                                |     2 +-
 Post/PViewDataGModel.h                          |     2 +-
 Post/PViewDataGModelIO.cpp                      |     7 +-
 Post/PViewDataIO.cpp                            |     3 +-
 Post/PViewDataList.h                            |     2 +-
 Post/PViewDataListIO.cpp                        |    28 +-
 Post/PViewIO.cpp                                |     6 +-
 Post/PViewOptions.h                             |     3 +-
 Post/shapeFunctions.h                           |     2 +-
 Solver/eigenSolver.cpp                          |    18 +-
 Solver/linearSystem.h                           |     3 +
 Solver/linearSystemPETSc.h                      |     5 +
 Solver/linearSystemPETSc.hpp                    |    12 +
 Solver/orthogonalTerm.h                         |    18 +-
 contrib/HighOrderMeshOptimizer/CADDistances.cpp |   101 +-
 contrib/HighOrderMeshOptimizer/CADDistances.h   |     4 +
 contrib/mobile/Android/AndroidManifest.xml      |     5 +
 contrib/mobile/README.txt                       |     2 +-
 contrib/mobile/iOS/Onelab/Onelab-Info.plist     |     8 +
 contrib/onelab2/CMakeLists.txt                  |    12 +
 contrib/onelab2/GmshLocalClient.cpp             |     9 +-
 contrib/onelab2/GmshLocalClient.h               |     1 +
 contrib/onelab2/NetworkUtils.cpp                |    47 +-
 contrib/onelab2/NetworkUtils.h                  |    12 +
 contrib/onelab2/OnelabAttributes.h              |     2 +-
 contrib/onelab2/OnelabDatabase.cpp              |    28 +-
 contrib/onelab2/OnelabDatabase.h                |    73 +-
 contrib/onelab2/OnelabException.h               |    48 +
 contrib/onelab2/OnelabLocalClient.h             |     2 +-
 contrib/onelab2/OnelabLocalNetworkClient.cpp    |    45 +-
 contrib/onelab2/OnelabLocalNetworkClient.h      |    43 +-
 contrib/onelab2/OnelabNetworkClient.cpp         |    41 +-
 contrib/onelab2/OnelabNetworkClient.h           |     2 +
 contrib/onelab2/OnelabServer.cpp                |   379 +-
 contrib/onelab2/OnelabServer.h                  |    58 +-
 contrib/onelab2/OnelabWindow.cpp                |   239 +
 contrib/onelab2/OnelabWindow.h                  |    34 +
 contrib/onelab2/UdtUtils.h                      |     4 +-
 contrib/onelab2/noudt.cpp                       |    74 +
 contrib/onelab2/noudt.h                         |    25 +
 contrib/onelab2/python/onelab2.py               |    21 +-
 demos/indheat.geo                               |     2 +-
 demos/view_groups.geo                           |    16 +
 doc/CREDITS.txt                                 |    27 +-
 doc/VERSIONS.txt                                |    14 +
 doc/gmsh.1                                      |     2 +-
 doc/gmsh.html                                   |    24 +-
 doc/texinfo/commandline.texi                    |     4 +-
 doc/texinfo/gmsh.texi                           |   545 +-
 doc/texinfo/opt_geometry.texi                   |    27 +-
 doc/texinfo/opt_plugin.texi                     |     5 +-
 doc/texinfo/opt_post.texi                       |    35 +-
 doc/texinfo/opt_view.texi                       |    15 +
 tutorial/image.png                              |   Bin 0 -> 78217 bytes
 tutorial/t1.geo                                 |    92 +-
 tutorial/t10.geo                                |    48 +-
 tutorial/t11.geo                                |    43 +-
 tutorial/t12.geo                                |    33 +-
 tutorial/t13.geo                                |    19 +-
 tutorial/t14.geo                                |    25 +-
 tutorial/t2.geo                                 |    89 +-
 tutorial/t3.geo                                 |    67 +-
 tutorial/t4.geo                                 |    87 +-
 tutorial/t5.geo                                 |    80 +-
 tutorial/t6.geo                                 |    26 +-
 tutorial/t7.geo                                 |    10 +-
 tutorial/t8.geo                                 |    11 +-
 tutorial/t9.geo                                 |    63 +-
 utils/misc/package_gmsh_getdp.sh                |    30 +-
 utils/solvers/c++/pend.cpp                      |    28 +-
 utils/solvers/python/pend.py                    |     2 +-
 utils/solvers/python/sub2.py                    |     9 +
 utils/svn-commit.tmp                            |     4 +
 wrappers/gmshpy/gmshGeo.i                       |    16 +
 170 files changed, 13874 insertions(+), 5811 deletions(-)

diff --cc CMakeLists.txt
index 41c8857,bac90b2..0ab2780
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -97,13 -94,8 +97,18 @@@ opt(WRAP_JAVA "Enable generation of Jav
  opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF)
  
  set(GMSH_MAJOR_VERSION 2)
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +set(GMSH_MINOR_VERSION 8)
 +set(GMSH_PATCH_VERSION 5)
 +=======
 +set(GMSH_MINOR_VERSION 9)
 +set(GMSH_PATCH_VERSION 3)
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ set(GMSH_MINOR_VERSION 10)
+ set(GMSH_PATCH_VERSION 1)
++>>>>>>> upstream/2.10.1+dfsg1
  set(GMSH_EXTRA_VERSION "" CACHE STRING "Gmsh extra version string")
  
  set(GMSH_VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}")
@@@ -119,27 -111,24 +124,27 @@@ set(GMSH_AP
      Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/MetricBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
 +<<<<<<< HEAD
 +=======
      Numeric/FuncSpaceData.h
 +>>>>>>> upstream/2.9.3+dfsg1
      Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
      Numeric/BasisFactory.h
-   Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h 
-     Geo/GFace.h Geo/GRegion.h Geo/GEdgeLoop.h Geo/GEdgeCompound.h 
+   Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h
+     Geo/GFace.h Geo/GRegion.h Geo/GEdgeLoop.h Geo/GEdgeCompound.h
      Geo/GFaceCompound.h Geo/GRegionCompound.h Geo/GRbf.h Geo/MVertex.h
-     Geo/MVertexBoundaryLayerData.h Geo/MEdge.h 
-     Geo/MFace.h Geo/MElement.h Geo/MElementOctree.h Geo/MPoint.h Geo/MLine.h 
-     Geo/MTriangle.h Geo/MQuadrangle.h Geo/MTetrahedron.h Geo/MHexahedron.h 
-     Geo/MPrism.h Geo/MPyramid.h Geo/MElementCut.h Geo/MElementOctree.h 
-     Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h 
-     Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h 
-     Geo/Pair.h Geo/Range.h Geo/SOrientedBoundingBox.h 
-     Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h Geo/Homology.h Geo/Chain.h 
+     Geo/MVertexBoundaryLayerData.h Geo/MEdge.h
+     Geo/MFace.h Geo/MElement.h Geo/MElementOctree.h Geo/MPoint.h Geo/MLine.h
+     Geo/MTriangle.h Geo/MQuadrangle.h Geo/MTetrahedron.h Geo/MHexahedron.h
+     Geo/MPrism.h Geo/MPyramid.h Geo/MElementCut.h Geo/MElementOctree.h
+     Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h
+     Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h
+     Geo/Pair.h Geo/Range.h Geo/SOrientedBoundingBox.h
+     Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h Geo/Homology.h Geo/Chain.h
      Geo/GenericVertex.h Geo/GenericEdge.h Geo/GenericFace.h Geo/GenericRegion.h
      Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h Geo/boundaryLayersData.h
-   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h 
-     Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h 
+   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h
+     Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
      Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
      Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/meshMetric.h
    Numeric/mathEvaluator.h
diff --cc Common/Context.h
index 27577a7,0913ded..2e3ed4d
--- a/Common/Context.h
+++ b/Common/Context.h
@@@ -72,13 -72,12 +72,15 @@@ struct contextGeometryOptions 
    double tolerance, snap[3], transform[3][3], offset[3];
    int occFixDegenerated, occFixSmallEdges, occFixSmallFaces;
    int occSewFaces, occConnectFaces;
 +<<<<<<< HEAD
 +=======
    double occScaling;
 +>>>>>>> upstream/2.9.3+dfsg1
    int copyMeshingMethod, copyDisplayAttributes, exactExtrusion;
    int matchGeomAndMesh;
-   int hideCompounds, orientedPhysicals;
+   int hideCompounds, orientedPhysicals, doubleClickedEntityTag;
+   std::string doubleClickedPointCommand, doubleClickedLineCommand;
+   std::string doubleClickedSurfaceCommand, doubleClickedVolumeCommand;
  };
  
  class CTX {
diff --cc Common/GmshMessage.h
index 7cc2ca8,69d5e1c..0d12e2d
--- a/Common/GmshMessage.h
+++ b/Common/GmshMessage.h
@@@ -60,12 -60,7 +60,15 @@@ class Msg 
  #elif defined(HAVE_ONELAB)
    // communication with onelab server
    static onelab::client *_onelabClient;
 +<<<<<<< HEAD
 +=======
  #endif
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
 +  // internal onelab status for Gmsh parser
 +  static std::string _gmshOnelabAction;
++=======
++>>>>>>> upstream/2.10.1+dfsg1
    // executable name
    static std::string _execName;
   public:
diff --cc Common/onelabUtils.cpp
index 70a825f,8c0551f..c5e0337
--- a/Common/onelabUtils.cpp
+++ b/Common/onelabUtils.cpp
@@@ -455,10 -459,8 +463,10 @@@ namespace onelabUtils 
        OnelabServer::instance()->setChanged(false, "Gmsh");
      }
  
-     Msg::SetGmshOnelabAction("");
+     Msg::SetOnelabAction("");
  
 +<<<<<<< HEAD
 +=======
      return redraw;
    }
  #else
diff --cc Fltk/onelabGroup.cpp
index 1fa2499,d3c1c09..bddcdde
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@@ -44,707 -44,9 +44,708 @@@ typedef unsigned long intptr_t
  #include "CreateFile.h"
  #include "drawContext.h"
  #include "PView.h"
+ #include "PViewOptions.h"
  #include "treeIcons.h"
  
 +<<<<<<< HEAD
 +#if defined(HAVE_ONELAB_METAMODEL)
 +#include "OnelabClients.h"
 +#include "metamodel.h"
 +#endif
 +
 +// This file contains the Gmsh/FLTK specific parts of the ONELAB
 +// interface. You'll need to reimplement this if you plan to build a different
 +// ONELAB server.
 +
 +class onelabGmshServer : public GmshServer{
 + private:
 +  onelab::localNetworkClient *_client;
 + public:
 +  onelabGmshServer(onelab::localNetworkClient *client)
 +    : GmshServer(), _client(client) {}
 +  ~onelabGmshServer(){}
 +  int NonBlockingSystemCall(const char *str)
 +  {
 +    return SystemCall(str);
 +  }
 +  int NonBlockingWait(double waitint, double timeout, int socket)
 +  {
 +    double start = GetTimeInSeconds();
 +    while(1){
 +      if(timeout > 0 && GetTimeInSeconds() - start > timeout)
 +        return 2; // timeout
 +      if(_client->getPid() < 0 || (_client->getExecutable().empty() &&
 +                                   !CTX::instance()->solver.listen))
 +        return 1; // process has been killed or we stopped listening
 +      // check if there is data (call select with a zero timeout to
 +      // return immediately, i.e., do polling)
 +      int ret = Select(0, 0, socket);
 +      if(ret == 0){ // nothing available
 +        if(timeout < 0){
 +          // if asked, refresh the onelab GUI, but no more than every 1/4th of
 +          // a second
 +          static double lastRefresh = 0.;
 +          if(start - lastRefresh > 0.25){
 +            std::vector<onelab::string> ps;
 +            onelab::server::instance()->get(ps, "Gmsh/Action");
 +            if(ps.size() && ps[0].getValue() == "refresh"){
 +              ps[0].setVisible(false);
 +              ps[0].setValue("");
 +              onelab::server::instance()->set(ps[0]);
 +              if(FlGui::available()) onelab_cb(0, (void*)"refresh");
 +            }
 +            lastRefresh = start;
 +          }
 +        }
 +        // wait at most waitint seconds and respond to FLTK events
 +        if(FlGui::available()) FlGui::instance()->wait(waitint);
 +        // return to caller (we will be back here soon again)
 +	if(timeout < 0) return 3;
 +      }
 +      else if(ret > 0){
 +        return 0; // data is there!
 +      }
 +      else{
 +        // an error happened
 +        _client->setPid(-1);
 +        return 1;
 +      }
 +    }
 +  }
 +  int LaunchClient()
 +  {
 +    std::string sockname;
 +    std::ostringstream tmp;
 +    const char *port = strstr(CTX::instance()->solver.socketName.c_str(), ":");
 +    if(!port){
 +      // Unix socket
 +      tmp << CTX::instance()->homeDir << CTX::instance()->solver.socketName
 +          << _client->getId();
 +      sockname = FixWindowsPath(tmp.str());
 +    }
 +    else{
 +      // TCP/IP socket
 +      if(CTX::instance()->solver.socketName.size() &&
 +         CTX::instance()->solver.socketName[0] == ':')
 +        tmp << GetHostName(); // prepend hostname if only the port number is given
 +      tmp << CTX::instance()->solver.socketName;
 +      if(atoi(port + 1)) // nonzero port is given - append client id
 +        tmp << _client->getId();
 +      sockname = tmp.str();
 +    }
 +
 +    std::string command = FixWindowsPath(_client->getExecutable());
 +    if(command.size()){
 +      std::vector<std::string> args = onelabUtils::getCommandLine(_client);
 +      for(unsigned int i = 0; i < args.size(); i++)
 +        command.append(" " + args[i]);
 +      command.append(" " + _client->getSocketSwitch() +
 +                     " \"" + _client->getName() + "\" %s");
 +    }
 +    else{
 +      Msg::Info("Listening on socket '%s'", sockname.c_str());
 +    }
 +
 +    int sock;
 +    try{
 +      sock = Start(command.c_str(), sockname.c_str(),
 +                   CTX::instance()->solver.timeout);
 +    }
 +    catch(const char *err){
 +      Msg::Error("Abnormal server termination (%s on socket %s)", err,
 +                 sockname.c_str());
 +      sock = -1;
 +    }
 +
 +    return sock;
 +  }
 +};
 +
 +bool gmshLocalNetworkClient::receiveMessage(gmshLocalNetworkClient *master)
 +{
 +  // receive a message on the associated GmshServer; 'master' is only used when
 +  // creating subclients with GMSH_CONNECT.
 +
 +  double timer = GetTimeInSeconds();
 +
 +  if(!getGmshServer()){
 +    Msg::Error("Abnormal server termination (no valid server)");
 +    return false;
 +  }
 +
 +  int type, length, swap;
 +  if(!getGmshServer()->ReceiveHeader(&type, &length, &swap)){
 +    Msg::Error("Abnormal server termination (did not receive message header)");
 +    return false;
 +  }
 +
 +  std::string message(length, ' '), blank = message;
 +  if(!getGmshServer()->ReceiveMessage(length, &message[0])){
 +    Msg::Error("Abnormal server termination (did not receive message body)");
 +    return false;
 +  }
 +
 +  if(message == blank && !(type == GmshSocket::GMSH_PROGRESS ||
 +                           type == GmshSocket::GMSH_INFO ||
 +                           type == GmshSocket::GMSH_WARNING ||
 +                           type == GmshSocket::GMSH_ERROR)){
 +    // we should still allow blank msg strings to be sent
 +    Msg::Error("Abnormal server termination (blank message: client not stopped?)");
 +    return false;
 +  }
 +
 +  switch (type) {
 +  case GmshSocket::GMSH_START:
 +    setPid(atoi(message.c_str()));
 +    break;
 +  case GmshSocket::GMSH_STOP:
 +    setPid(-1);
 +    if(getFather()){
 +      std::string reply = getName(); // reply is dummy
 +      getFather()->getGmshServer()->SendMessage
 +        (GmshSocket::GMSH_STOP, reply.size(), &reply[0]);
 +    }
 +    break;
 +  case GmshSocket::GMSH_PARAMETER:
 +  case GmshSocket::GMSH_PARAMETER_UPDATE:
 +    {
 +      std::string version, ptype, name;
 +      onelab::parameter::getInfoFromChar(message, version, ptype, name);
 +      if(onelab::parameter::version() != version){
 +        Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
 +                   onelab::parameter::version().c_str(), version.c_str());
 +      }
 +      else if(ptype == "number"){
 +        onelab::number p; p.fromChar(message);
 +        if(type == GmshSocket::GMSH_PARAMETER_UPDATE){
 +          std::vector<onelab::number> par; get(par, name);
 +          if(par.size()) {
 +            onelab::number y = p; p = par[0]; onelabUtils::updateNumber(p, y);
 +          }
 +        }
 +        set(p);
 +        if(p.getName() == getName() + "/Progress")
 +          if(FlGui::available())
 +            FlGui::instance()->setProgress(p.getLabel().c_str(), p.getValue(),
 +                                           p.getMin(), p.getMax());
 +      }
 +      else if(ptype == "string"){
 +        onelab::string p; p.fromChar(message);
 +        if(type == GmshSocket::GMSH_PARAMETER_UPDATE){
 +          std::vector<onelab::string> par; get(par, name);
 +          if(par.size()){
 +            onelab::string y = p; p = par[0]; onelabUtils::updateString(p,y);
 +          }
 +	}
 +        set(p);
 +      }
 +      else if(ptype == "region"){
 +        onelab::region p; p.fromChar(message); set(p);
 +      }
 +      else if(ptype == "function"){
 +        onelab::function p; p.fromChar(message); set(p);
 +      }
 +      else
 +        Msg::Error("Unknown ONELAB parameter type: %s", ptype.c_str());
 +    }
 +    break;
 +  case GmshSocket::GMSH_PARAMETER_QUERY:
 +    {
 +      std::string version, ptype, name, reply;
 +      onelab::parameter::getInfoFromChar(message, version, ptype, name);
 +      if(onelab::parameter::version() != version){
 +        Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
 +                   onelab::parameter::version().c_str(), version.c_str());
 +      }
 +      else if(ptype == "number"){
 +        std::vector<onelab::number> par; get(par, name);
 +        if(par.size() == 1) reply = par[0].toChar();
 +      }
 +      else if(ptype == "string"){
 +        std::vector<onelab::string> par; get(par, name);
 +        if(par.size() == 1) reply = par[0].toChar();
 +      }
 +      else if(ptype == "region"){
 +        std::vector<onelab::region> par; get(par, name);
 +        if(par.size() == 1) reply = par[0].toChar();
 +      }
 +      else if(ptype == "function"){
 +        std::vector<onelab::function> par; get(par, name);
 +        if(par.size() == 1) reply = par[0].toChar();
 +      }
 +      else
 +        Msg::Error("Unknown ONELAB parameter type in query: %s", ptype.c_str());
 +
 +      if(reply.size()){
 +        getGmshServer()->SendMessage
 +          (GmshSocket::GMSH_PARAMETER, reply.size(), &reply[0]);
 +      }
 +      else{
 +        reply = name;
 +        getGmshServer()->SendMessage
 +          (GmshSocket::GMSH_PARAMETER_NOT_FOUND, reply.size(), &reply[0]);
 +      }
 +    }
 +    break;
 +  case GmshSocket::GMSH_PARAMETER_QUERY_ALL:
 +    {
 +      std::string version, ptype, name, reply;
 +      std::vector<std::string> replies;
 +      onelab::parameter::getInfoFromChar(message, version, ptype, name);
 +      if(onelab::parameter::version() != version){
 +        Msg::Error("ONELAB version mismatch (server: %s / client: %s)",
 +                   onelab::parameter::version().c_str(), version.c_str());
 +      }
 +      else if(ptype == "number"){
 +        std::vector<onelab::number> numbers; get(numbers);
 +        for(std::vector<onelab::number>::iterator it = numbers.begin();
 +            it != numbers.end(); it++) replies.push_back((*it).toChar());
 +      }
 +      else if(ptype == "string"){
 +        std::vector<onelab::string> strings; get(strings);
 +        for(std::vector<onelab::string>::iterator it = strings.begin();
 +            it != strings.end(); it++) replies.push_back((*it).toChar());
 +      }
 +      else if(ptype == "region"){
 +        std::vector<onelab::region> regions; get(regions);
 +        for(std::vector<onelab::region>::iterator it = regions.begin();
 +            it != regions.end(); it++) replies.push_back((*it).toChar());
 +      }
 +      else if(ptype == "function"){
 +        std::vector<onelab::function> functions; get(functions);
 +        for(std::vector<onelab::function>::iterator it = functions.begin();
 +            it != functions.end(); it++) replies.push_back((*it).toChar());
 +      }
 +      else
 +        Msg::Error("Unknown ONELAB parameter type in query: %s", ptype.c_str());
 +
 +      for(unsigned int i = 0; i < replies.size(); i++)
 +        getGmshServer()->SendMessage
 +          (GmshSocket::GMSH_PARAMETER_QUERY_ALL, replies[i].size(), &replies[i][0]);
 +      reply = "Sent all ONELAB " + ptype + "s";
 +      getGmshServer()->SendMessage
 +        (GmshSocket::GMSH_PARAMETER_QUERY_END, reply.size(), &reply[0]);
 +    }
 +    break;
 +  case GmshSocket::GMSH_PARAMETER_CLEAR:
 +    clear(message == "*" ? "" : message);
 +    break;
 +  case GmshSocket::GMSH_PROGRESS:
 +    Msg::StatusBar(false, "%s %s", _name.c_str(), message.c_str());
 +    break;
 +  case GmshSocket::GMSH_INFO:
 +    Msg::Direct("Info    : %s - %s", _name.c_str(), message.c_str());
 +    break;
 +  case GmshSocket::GMSH_WARNING:
 +    Msg::Warning("%s - %s", _name.c_str(), message.c_str());
 +    break;
 +  case GmshSocket::GMSH_ERROR:
 +    Msg::Error("%s - %s", _name.c_str(), message.c_str());
 +    break;
 +  case GmshSocket::GMSH_MERGE_FILE:
 +    if(CTX::instance()->solver.autoMergeFile){
 +      unsigned int n = PView::list.size();
 +      MergePostProcessingFile(message, CTX::instance()->solver.autoShowViews,
 +                              CTX::instance()->solver.autoShowLastStep, true);
 +      drawContext::global()->draw();
 +      if(FlGui::available() && n != PView::list.size()){
 +        FlGui::instance()->rebuildTree(true);
 +        FlGui::instance()->openModule("Post-processing");
 +      }
 +    }
 +    break;
 +  case GmshSocket::GMSH_OPEN_PROJECT:
 +    OpenProject(message);
 +    drawContext::global()->draw();
 +    break;
 +  case GmshSocket::GMSH_PARSE_STRING:
 +    ParseString(message);
 +    drawContext::global()->draw();
 +    break;
 +  case GmshSocket::GMSH_SPEED_TEST:
 +    Msg::Info("got %d Mb message in %g seconds",
 +              length / 1024 / 1024, GetTimeInSeconds() - timer);
 +    break;
 +  case GmshSocket::GMSH_VERTEX_ARRAY:
 +    {
 +      int n = PView::list.size();
 +      PView::fillVertexArray(this, length, &message[0], swap);
 +      if(FlGui::available())
 +        FlGui::instance()->updateViews(n != (int)PView::list.size(), true);
 +      drawContext::global()->draw();
 +    }
 +    break;
 +  case GmshSocket::GMSH_CONNECT:
 +    {
 +      std::string::size_type first = 0;
 +      std::string clientName = onelab::parameter::getNextToken(message, first);
 +      std::string command = onelab::parameter::getNextToken(message, first);
 +      gmshLocalNetworkClient* subClient =
 +	new gmshLocalNetworkClient(clientName, command);
 +      onelabGmshServer *server = new onelabGmshServer(subClient);
 +      subClient->setPid(0);
 +      int sock = server->LaunchClient();
 +      if(sock < 0){ // could not establish the connection: aborting
 +	server->Shutdown();
 +	delete server;
 +	Msg::Error("Could not connect client '%s'", subClient->getName().c_str());
 +      }
 +      else{
 +	Msg::StatusBar(true, "Running '%s'...", subClient->getName().c_str());
 +	subClient->setGmshServer(server);
 +	subClient->setFather(this);
 +	master->addClient(subClient);
 +      }
 +    }
 +    break;
 +  case GmshSocket::GMSH_OLPARSE:
 +    {
 +#if defined(HAVE_ONELAB_METAMODEL)
 +      std::string::size_type first = 0;
 +      std::string name = onelab::parameter::getNextToken(message, first);
 +      std::string fileName = onelab::parameter::getNextToken(message, first);
 +      std::vector<std::string> split = SplitOLFileName(fileName);
 +      std::string ofileName = split[0] + split[1] ;
 +      std::ofstream outfile(ofileName.c_str());
 +      localSolverClient *c = new InterfacedClient(name,"","");
 +      if (outfile.is_open()) {
 +        Msg::Info("Preprocess file <%s>",ofileName.c_str());
 +        c->convert_onefile(fileName, outfile);
 +      }
 +      else
 +        Msg::Error("The file <%s> cannot be opened",ofileName.c_str());
 +      outfile.close();
 +
 +      std::string reply = onelab::server::instance()->getChanged(c->getName()) ?
 +        "true" : "false";
 +      getGmshServer()->SendMessage
 +        (GmshSocket::GMSH_OLPARSE, reply.size(), &reply[0]);
 +
 +      delete c;
 +#endif
 +    }
 +    break;
 +  case GmshSocket::GMSH_CLIENT_CHANGED:
 +    {
 +      std::string::size_type first = 0;
 +      std::string command = onelab::parameter::getNextToken(message, first);
 +       std::string name = onelab::parameter::getNextToken(message, first);
 +     if(command == "get"){
 +       std::string reply = onelab::server::instance()->getChanged(name) ?
 +        "true" : "false";
 +      getGmshServer()->SendMessage
 +        (GmshSocket::GMSH_CLIENT_CHANGED, reply.size(), &reply[0]);
 +      }
 +      else if(command == "set"){
 +	std::string changed = onelab::parameter::getNextToken(message, first);
 +	onelab::server::instance()->setChanged(changed=="true"?true:false,name);
 +      }
 +    }
 +    break;
 +  default:
 +    Msg::Warning("Received unknown message type (%d)", type);
 +    break;
 +  }
 +
 +  return true;
 +}
 +
 +bool gmshLocalNetworkClient::run()
 +{
 + new_connection:
 +  setPid(0); // dummy pid, should be non-negative
 +
 +  onelabGmshServer *server = new onelabGmshServer(this);
 +
 +  int sock = server->LaunchClient();
 +
 +  if(sock < 0){
 +    // could not establish the connection: aborting
 +    server->Shutdown();
 +    delete server;
 +    return false;
 +  }
 +
 +  Msg::StatusBar(true, "Running '%s'...", _name.c_str());
 +
 +  setGmshServer(server);
 +
 +  while(1) {
 +    if(getExecutable().empty() && !CTX::instance()->solver.listen){
 +      // we stopped listening to the special "Listen" client
 +      break;
 +    }
 +
 +    // loop over all the clients (usually only one, but can be more if we
 +    // spawned subclients) and check if data is available for one of them
 +    bool stop = false, haveData = false;
 +    gmshLocalNetworkClient *c = 0;
 +    std::vector<gmshLocalNetworkClient*> toDelete;
 +    for(int i = 0; i < getNumClients(); i++){
 +      c = getClient(i);
 +      if(c->getPid() < 0){
 +        if(c == this){ // the "master" client stopped
 +          stop = true;
 +          break;
 +        }
 +        else{
 +          // this subclient is not active anymore: shut down and delete its
 +          // server and mark the client for deletion
 +          GmshServer *s = c->getGmshServer();
 +          c->setGmshServer(0);
 +          c->setFather(0);
 +          if(s){
 +            s->Shutdown();
 +            delete s;
 +          }
 +          toDelete.push_back(c);
 +          continue;
 +        }
 +      }
 +      GmshServer *s = c->getGmshServer();
 +      if(!s){
 +        Msg::Error("Abnormal server termination (no valid server)");
 +        stop = true;
 +        break;
 +      }
 +      else{
 +        int ret = s->NonBlockingWait(0.001, -1.);
 +        if(ret == 0){ // we have data from this particular client
 +          haveData = true;
 +          break;
 +        }
 +        else if(ret == 3){ // pass to the next client
 +          continue;
 +        }
 +        else{ // an error occurred
 +          stop = true;
 +          break;
 +        }
 +      }
 +    }
 +    for(unsigned int i = 0; i < toDelete.size(); i++){
 +      removeClient(toDelete[i]);
 +      delete toDelete[i];
 +    }
 +
 +    // break the while(1) if the master client has stopped or if we encountered
 +    // a problem
 +    if(stop) break;
 +
 +    // if data is available try to get the message from the corresponding
 +    // client; break the while(1) if we could not receive the message
 +    if(haveData && !c->receiveMessage(this)) break;
 +
 +    // break the while(1) if the master client has stopped
 +    if(c == this && c->getPid() < 0) break;
 +  }
 +
 +  // we are done running the (master) client: delete the servers and the
 +  // subclients, if any remain (they should have been deleted already).
 +  std::vector<gmshLocalNetworkClient*> toDelete;
 +  for(int i = 0; i < getNumClients(); i++){
 +    gmshLocalNetworkClient *c = getClient(i);
 +    GmshServer *s = c->getGmshServer();
 +    c->setGmshServer(0);
 +    c->setFather(0);
 +    if(s){
 +      s->Shutdown();
 +      delete s;
 +    }
 +    if(c != this){
 +      if(c->getPid() > 0)
 +        Msg::Error("Subclient %s was not stopped correctly", c->getName().c_str());
 +      toDelete.push_back(c);
 +    }
 +  }
 +  for(unsigned int i = 0; i < toDelete.size(); i++){
 +    removeClient(toDelete[i]);
 +    delete toDelete[i];
 +  }
 +
 +  Msg::StatusBar(true, "Done running '%s'", _name.c_str());
 +
 +  if(getExecutable().empty()){
 +    Msg::Info("Client disconnected: starting new connection");
 +    goto new_connection;
 +  }
 +
 +  return true;
 +}
 +
 +bool gmshLocalNetworkClient::kill()
 +{
 +  // FIXME: we should kill all the clients in the list
 +  if(getPid() > 0) {
 +    if(KillProcess(getPid())){
 +      Msg::Info("Killed '%s' (pid %d)", _name.c_str(), getPid());
 +      if(FlGui::available())
 +        FlGui::instance()->setProgress("Killed", 0, 0, 0);
 +      setPid(-1);
 +      return true;
 +    }
 +  }
 +  setPid(-1);
 +  return false;
 +}
 +
 +static void initializeLoops()
 +{
 +  onelabUtils::initializeLoop("1");
 +  onelabUtils::initializeLoop("2");
 +  onelabUtils::initializeLoop("3");
 +
 +  if(FlGui::available() && onelab::server::instance()->getChanged())
 +    FlGui::instance()->rebuildTree(false);
 +}
 +
 +static bool incrementLoops()
 +{
 +  bool ret = false;
 +  if(onelabUtils::incrementLoop("3"))      ret = true;
 +  else if(onelabUtils::incrementLoop("2")) ret = true;
 +  else if(onelabUtils::incrementLoop("1")) ret = true;
 +
 +  //Define ONELAB parameter indicating whether or not in a loop
 +  onelab::number n("0Metamodel/Loop",ret?1:0);
 +  n.setVisible(false);
 +  onelab::server::instance()->set(n);
 +
 +  if(FlGui::available() && onelab::server::instance()->getChanged())
 +    FlGui::instance()->rebuildTree(false);
 +
 +  return ret;
 +}
 +
 +static void updateGraphs()
 +{
 +  bool redraw = false;
 +  for(int i = 0; i < 18; i++){
 +    std::ostringstream tmp;
 +    tmp << i;
 +    bool ret = onelabUtils::updateGraph(tmp.str());
 +    redraw = redraw || ret;
 +  }
 +  if(redraw){
 +    // don't delete the widgets, as this is called in widget callbacks
 +    FlGui::instance()->updateViews(true, false);
 +    drawContext::global()->draw();
 +  }
 +}
 +
 +static std::string timeStamp()
 +{
 +  time_t now;
 +  time(&now);
 +  tm *t = localtime(&now);
 +  char stamp[32];
 +  // stamp.size() is always 20
 +  sprintf(stamp, "_%04d-%02d-%02d_%02d-%02d-%02d", 1900 + t->tm_year,
 +          1 + t->tm_mon, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
 +  return std::string(stamp);
 +}
 +
 +static void saveDb(const std::string &fileName)
 +{
 +  FILE *fp = Fopen(fileName.c_str(), "wb");
 +  if(fp){
 +    Msg::StatusBar(true, "Saving database '%s'...", fileName.c_str());
 +    onelab::server::instance()->toFile(fp);
 +    fclose(fp);
 +    Msg::StatusBar(true, "Done saving database '%s'", fileName.c_str());
 +  }
 +  else
 +    Msg::Error("Could not save database '%s'", fileName.c_str());
 +}
 +
 +static void archiveOutputFiles(const std::string &fileName)
 +{
 +  std::string stamp;
 +  std::vector<onelab::string> ps;
 +  onelab::server::instance()->get(ps,"0Metamodel/9Tag");
 +  if(ps.size())
 +    stamp.assign(ps[0].getValue()+timeStamp());
 +  else
 +    stamp.assign(timeStamp());
 +
 +  // add time stamp in all output files in the db, and rename them on disk
 +  std::vector<onelab::string> strings;
 +  onelab::server::instance()->get(strings);
 +  for(unsigned int i = 0; i < strings.size(); i++){
 +    if(strings[i].getName().find("9Output files") != std::string::npos){
 +      std::vector<std::string> names = strings[i].getChoices();
 +      names.push_back(strings[i].getValue());
 +      for(unsigned int j = 0; j < names.size(); j++){
 +        std::vector<std::string> split = SplitFileName(names[j]);
 +        int n = split[1].size();
 +        // if name is not already stamped
 +        if(n < 18 || split[1][n-3] != '-' || split[1][n-6] != '-' ||
 +           split[1][n-9] != '_'){
 +          std::string old = names[j];
 +          CreateSingleDir(split[0] + "archive/");
 +          names[j] = split[0] + "archive/" + split[1] + stamp + split[2];
 +          Msg::Info("Renaming '%s' into '%s'", old.c_str(), names[j].c_str());
 +          rename(old.c_str(), names[j].c_str());
 +        }
 +      }
 +      strings[i].setValue(names.back());
 +      names.pop_back();
 +      strings[i].setChoices(names);
 +      onelab::server::instance()->set(strings[i]);
 +    }
 +  }
 +
 +  // save stamped db
 +  {
 +    std::vector<std::string> split = SplitFileName(fileName);
 +    CreateSingleDir(split[0] + "archive/");
 +    saveDb(split[0] + "archive/" + split[1] + stamp + split[2]);
 +  }
 +
 +  FlGui::instance()->rebuildTree(true);
 +}
 +
 +static void archiveSolutionFiles(const std::string &fileName)
 +{
 +  // extract tag from dbName
 +  std::vector<std::string> split = SplitFileName(fileName);
 +  std::string tag = split[1].substr(6); // cut off 'onelab'
 +
 +  // add tag to all solution files in the db, and rename them on disk
 +  std::vector<onelab::string> strings;
 +  onelab::server::instance()->get(strings,"0Metamodel/9Solution files");
 +  if(strings.size()){
 +    std::vector<std::string> names = strings[0].getChoices();
 +    if(names.size()){
 +      for(unsigned int j = 0; j < names.size(); j++){
 +	std::vector<std::string> split = SplitFileName(names[j]);
 +	std::string old = names[j];
 +	CreateSingleDir(split[0] + "archive/");
 +	names[j] = split[0] + "archive/" + split[1] + tag + split[2];
 +	Msg::Info("Renaming '%s' into '%s'", old.c_str(), names[j].c_str());
 +	rename(old.c_str(), names[j].c_str());
 +      }
 +      strings[0].setValue(names[0]);
 +      strings[0].setChoices(names);
 +      onelab::server::instance()->set(strings[0]);
 +      FlGui::instance()->rebuildTree(true);
 +    }
 +  }
 +}
 +
 +static void loadDb(const std::string &name)
 +{
 +  Msg::StatusBar(true, "Loading database '%s'...", name.c_str());
 +  FILE *fp = Fopen(name.c_str(), "rb");
 +  if(fp){
 +    onelab::server::instance()->fromFile(fp);
 +    fclose(fp);
 +    Msg::StatusBar(true, "Done loading database '%s'", name.c_str());
 +  }
 +  else
 +    Msg::Error("Could not load database '%s'", name.c_str());
 +}
 +=======
  // This file contains the Gmsh/FLTK specific parts of the ONELAB
  // interface. You'll need to reimplement this if you plan to build a different
  // ONELAB server.
diff --cc Graphics/drawContext.cpp
index b3e3f63,d391845..8d2c356
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@@ -378,57 -378,31 +379,65 @@@ void drawContext::invalidateBgImageText
    _bgImageTexture = 0;
  }
  
- void drawContext::drawBackgroundImage(bool threeD)
+ bool drawContext::generateTextureForImage(const std::string &name, int page,
+                                           GLuint &imageTexture, GLuint &imageW,
+                                           GLuint &imageH)
  {
++<<<<<<< HEAD
 +  if(CTX::instance()->bgImageFileName.empty() ||
 +     (CTX::instance()->bgImage3d && !threeD) ||
 +     (!CTX::instance()->bgImage3d && threeD)) return;
 +
 +  std::string name = FixRelativePath(GModel::current()->getFileName(),
 +                                     CTX::instance()->bgImageFileName);
 +  std::string ext = SplitFileName(CTX::instance()->bgImageFileName)[2];
 +
 +=======
 +
 +void drawContext::invalidateBgImageTexture()
 +{
 +  if(_bgImageTexture) glDeleteTextures(1, &_bgImageTexture);
 +  _bgImageTexture = 0;
 +}
 +
 +void drawContext::drawBackgroundImage(bool threeD)
 +{
 +  if(CTX::instance()->bgImageFileName.empty() ||
 +     (CTX::instance()->bgImage3d && !threeD) ||
 +     (!CTX::instance()->bgImage3d && threeD)) return;
 +
 +  std::string name = FixRelativePath(GModel::current()->getFileName(),
 +                                     CTX::instance()->bgImageFileName);
 +  std::string ext = SplitFileName(CTX::instance()->bgImageFileName)[2];
 +
 +>>>>>>> upstream/2.9.3+dfsg1
 +  double x = CTX::instance()->bgImagePosition[0];
 +  double y = CTX::instance()->bgImagePosition[1];
 +  double w = CTX::instance()->bgImageSize[0];
 +  double h = CTX::instance()->bgImageSize[1];
++=======
+   if(StatFile(name)){
+     Msg::Warning("Could not open file `%s'", name.c_str());
+     return false;
+   }
++>>>>>>> upstream/2.10.1+dfsg1
  
+   std::string ext = SplitFileName(name)[2];
    if(ext == ".pdf" || ext == ".PDF"){
  #if defined(HAVE_POPPLER)
-     if(!_bgImageTexture){
+     if(!imageTexture){
        if(!gmshPopplerWrapper::instance()->loadFromFile(name)){
          Msg::Error("Could not load PDF file '%s'", name.c_str());
-         CTX::instance()->bgImageFileName.clear();
-         return;
+         return false;
        }
      }
-     gmshPopplerWrapper::instance()->setCurrentPage(CTX::instance()->bgImagePage);
-     _bgImageTexture = gmshPopplerWrapper::instance()->getTextureForPage(300, 300);
-     _bgImageW = gmshPopplerWrapper::instance()->width();
-     _bgImageH = gmshPopplerWrapper::instance()->height();
+     gmshPopplerWrapper::instance()->setCurrentPage(page);
+     imageTexture = gmshPopplerWrapper::instance()->getTextureForPage(300, 300);
+     imageW = gmshPopplerWrapper::instance()->width();
+     imageH = gmshPopplerWrapper::instance()->height();
  #else
      Msg::Error("Gmsh must be compiled with Poppler support to load PDFs");
-     CTX::instance()->bgImageFileName.clear();
-     return;
+     return false;
  #endif
    }
    else{
diff --cc Graphics/drawContext.h
index 4c44d47,2395720..44b9c5d
--- a/Graphics/drawContext.h
+++ b/Graphics/drawContext.h
@@@ -113,10 -114,9 +114,15 @@@ class drawContext 
    std::set<GModel*> _hiddenModels;
    std::set<PView*> _hiddenViews;
    GLuint _bgImageTexture, _bgImageW, _bgImageH;
 +<<<<<<< HEAD
 +=======
    openglWindow *_openglWindow;
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   struct imgtex{ GLuint tex, w, h; };
+   std::map<std::string, imgtex> _imageTextures;
++>>>>>>> upstream/2.10.1+dfsg1
   public:
    Camera camera;
    double r[3]; // current Euler angles (in degrees!)
diff --cc Parser/FunctionManager.cpp
index a4709f7,d17141d..d9d2e04
--- a/Parser/FunctionManager.cpp
+++ b/Parser/FunctionManager.cpp
@@@ -45,13 -45,13 +45,21 @@@ FunctionManager *FunctionManager::Insta
    return instance;
  }
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +int FunctionManager::enterFunction(char *name, gmshFILE * f, std::string &filename,
 +                                   int &lno) const
 +=======
++=======
+ void FunctionManager::clear()
+ {
+   functions->m.clear();
+ }
+ 
++>>>>>>> upstream/2.10.1+dfsg1
  int FunctionManager::enterFunction(const std::string &name, gmshFILE * f,
                                     std::string &filename, int &lno) const
 +>>>>>>> upstream/2.9.3+dfsg1
  {
    if(functions->m.find(name) == functions->m.end())
      return 0;
@@@ -83,14 -83,11 +91,16 @@@ int FunctionManager::leaveFunction(gmsh
    return 1;
  }
  
 +<<<<<<< HEAD
 +int FunctionManager::createFunction(char *name, gmshFILE  f, std::string &filename,
 +                                    int lno)
 +=======
  int FunctionManager::createFunction(const std::string &name, gmshFILE f,
                                      const std::string &filename, int lno)
 +>>>>>>> upstream/2.9.3+dfsg1
  {
+   if(functions->m.find(name) != functions->m.end())
+     return 0;
    File_Position fp;
    fp.file = f;
    fp.filename = filename;
diff --cc Parser/FunctionManager.h
index dddfe03,c03882e..8f0e801
--- a/Parser/FunctionManager.h
+++ b/Parser/FunctionManager.h
@@@ -30,8 -26,8 +30,9 @@@ class FunctionManage
                       const std::string &filename, int lineno);
    int enterFunction(const std::string &name, gmshFILE *f,
                      std::string &filename, int &lineno) const;
 +>>>>>>> upstream/2.9.3+dfsg1
    int leaveFunction(gmshFILE *f, std::string &filename, int &lineno);
+   void clear();
  };
  
  #endif
diff --cc Parser/Gmsh.tab.cpp
index ba33707,45ff97f..c27c7d9
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@@ -552,193 -204,196 +557,204 @@@ struct doubleXstring
  extern int gmsh_yydebug;
  #endif
  
- /* Tokens.  */
+ /* Token type.  */
  #ifndef YYTOKENTYPE
  # define YYTOKENTYPE
-    /* Put the tokens into the symbol table, so that GDB and other debuggers
-       know about them.  */
-    enum yytokentype {
-      tDOUBLE = 258,
-      tSTRING = 259,
-      tBIGSTR = 260,
-      tEND = 261,
-      tAFFECT = 262,
-      tDOTS = 263,
-      tPi = 264,
-      tMPI_Rank = 265,
-      tMPI_Size = 266,
-      tEuclidian = 267,
-      tCoordinates = 268,
-      tExp = 269,
-      tLog = 270,
-      tLog10 = 271,
-      tSqrt = 272,
-      tSin = 273,
-      tAsin = 274,
-      tCos = 275,
-      tAcos = 276,
-      tTan = 277,
-      tRand = 278,
-      tAtan = 279,
-      tAtan2 = 280,
-      tSinh = 281,
-      tCosh = 282,
-      tTanh = 283,
-      tFabs = 284,
-      tFloor = 285,
-      tCeil = 286,
-      tRound = 287,
-      tFmod = 288,
-      tModulo = 289,
-      tHypot = 290,
-      tList = 291,
-      tPrintf = 292,
-      tError = 293,
-      tStr = 294,
-      tSprintf = 295,
-      tStrCat = 296,
-      tStrPrefix = 297,
-      tStrRelative = 298,
-      tStrReplace = 299,
-      tFind = 300,
-      tStrFind = 301,
-      tStrCmp = 302,
-      tStrChoice = 303,
-      tTextAttributes = 304,
-      tBoundingBox = 305,
-      tDraw = 306,
-      tSetChanged = 307,
-      tToday = 308,
-      tFixRelativePath = 309,
-      tSyncModel = 310,
-      tOnelabAction = 311,
-      tOnelabRun = 312,
-      tCpu = 313,
-      tMemory = 314,
-      tTotalMemory = 315,
-      tCreateTopology = 316,
-      tCreateTopologyNoHoles = 317,
-      tDistanceFunction = 318,
-      tDefineConstant = 319,
-      tUndefineConstant = 320,
-      tDefineNumber = 321,
-      tDefineString = 322,
-      tPoint = 323,
-      tCircle = 324,
-      tEllipse = 325,
-      tLine = 326,
-      tSphere = 327,
-      tPolarSphere = 328,
-      tSurface = 329,
-      tSpline = 330,
-      tVolume = 331,
-      tCharacteristic = 332,
-      tLength = 333,
-      tParametric = 334,
-      tElliptic = 335,
-      tRefineMesh = 336,
-      tAdaptMesh = 337,
-      tRelocateMesh = 338,
-      tPlane = 339,
-      tRuled = 340,
-      tTransfinite = 341,
-      tComplex = 342,
-      tPhysical = 343,
-      tCompound = 344,
-      tPeriodic = 345,
-      tUsing = 346,
-      tPlugin = 347,
-      tDegenerated = 348,
-      tRecursive = 349,
-      tRotate = 350,
-      tTranslate = 351,
-      tSymmetry = 352,
-      tDilate = 353,
-      tExtrude = 354,
-      tLevelset = 355,
-      tRecombine = 356,
-      tSmoother = 357,
-      tSplit = 358,
-      tDelete = 359,
-      tCoherence = 360,
-      tIntersect = 361,
-      tMeshAlgorithm = 362,
-      tReverse = 363,
-      tLayers = 364,
-      tScaleLast = 365,
-      tHole = 366,
-      tAlias = 367,
-      tAliasWithOptions = 368,
-      tCopyOptions = 369,
-      tQuadTriAddVerts = 370,
-      tQuadTriNoNewVerts = 371,
-      tQuadTriSngl = 372,
-      tQuadTriDbl = 373,
-      tRecombLaterals = 374,
-      tTransfQuadTri = 375,
-      tText2D = 376,
-      tText3D = 377,
-      tInterpolationScheme = 378,
-      tTime = 379,
-      tCombine = 380,
-      tBSpline = 381,
-      tBezier = 382,
-      tNurbs = 383,
-      tNurbsOrder = 384,
-      tNurbsKnots = 385,
-      tColor = 386,
-      tColorTable = 387,
-      tFor = 388,
-      tIn = 389,
-      tEndFor = 390,
-      tIf = 391,
-      tEndIf = 392,
-      tExit = 393,
-      tAbort = 394,
-      tField = 395,
-      tReturn = 396,
-      tCall = 397,
-      tFunction = 398,
-      tShow = 399,
-      tHide = 400,
-      tGetValue = 401,
-      tGetEnv = 402,
-      tGetString = 403,
-      tHomology = 404,
-      tCohomology = 405,
-      tBetti = 406,
-      tSetOrder = 407,
-      tExists = 408,
-      tFileExists = 409,
-      tGMSH_MAJOR_VERSION = 410,
-      tGMSH_MINOR_VERSION = 411,
-      tGMSH_PATCH_VERSION = 412,
-      tAFFECTDIVIDE = 413,
-      tAFFECTTIMES = 414,
-      tAFFECTMINUS = 415,
-      tAFFECTPLUS = 416,
-      tOR = 417,
-      tAND = 418,
-      tNOTEQUAL = 419,
-      tEQUAL = 420,
-      tGREATEROREQUAL = 421,
-      tLESSOREQUAL = 422,
-      UNARYPREC = 423,
-      tMINUSMINUS = 424,
-      tPLUSPLUS = 425
-    };
+   enum yytokentype
+   {
+     tDOUBLE = 258,
+     tSTRING = 259,
+     tBIGSTR = 260,
+     tEND = 261,
+     tAFFECT = 262,
+     tDOTS = 263,
+     tPi = 264,
+     tMPI_Rank = 265,
+     tMPI_Size = 266,
+     tEuclidian = 267,
+     tCoordinates = 268,
+     tExp = 269,
+     tLog = 270,
+     tLog10 = 271,
+     tSqrt = 272,
+     tSin = 273,
+     tAsin = 274,
+     tCos = 275,
+     tAcos = 276,
+     tTan = 277,
+     tRand = 278,
+     tAtan = 279,
+     tAtan2 = 280,
+     tSinh = 281,
+     tCosh = 282,
+     tTanh = 283,
+     tFabs = 284,
+     tFloor = 285,
+     tCeil = 286,
+     tRound = 287,
+     tFmod = 288,
+     tModulo = 289,
+     tHypot = 290,
+     tList = 291,
+     tPrintf = 292,
+     tError = 293,
+     tStr = 294,
+     tSprintf = 295,
+     tStrCat = 296,
+     tStrPrefix = 297,
+     tStrRelative = 298,
+     tStrReplace = 299,
+     tFind = 300,
+     tStrFind = 301,
+     tStrCmp = 302,
+     tStrChoice = 303,
+     tTextAttributes = 304,
+     tBoundingBox = 305,
+     tDraw = 306,
+     tSetChanged = 307,
+     tToday = 308,
+     tFixRelativePath = 309,
+     tCurrentDirectory = 310,
+     tSyncModel = 311,
+     tNewModel = 312,
+     tOnelabAction = 313,
+     tOnelabRun = 314,
+     tCpu = 315,
+     tMemory = 316,
+     tTotalMemory = 317,
+     tCreateTopology = 318,
+     tCreateTopologyNoHoles = 319,
+     tDistanceFunction = 320,
+     tDefineConstant = 321,
+     tUndefineConstant = 322,
+     tDefineNumber = 323,
+     tDefineString = 324,
+     tSetNumber = 325,
+     tSetString = 326,
+     tPoint = 327,
+     tCircle = 328,
+     tEllipse = 329,
+     tLine = 330,
+     tSphere = 331,
+     tPolarSphere = 332,
+     tSurface = 333,
+     tSpline = 334,
+     tVolume = 335,
+     tCharacteristic = 336,
+     tLength = 337,
+     tParametric = 338,
+     tElliptic = 339,
+     tRefineMesh = 340,
+     tAdaptMesh = 341,
+     tRelocateMesh = 342,
+     tPlane = 343,
+     tRuled = 344,
+     tTransfinite = 345,
+     tComplex = 346,
+     tPhysical = 347,
+     tCompound = 348,
+     tPeriodic = 349,
+     tUsing = 350,
+     tPlugin = 351,
+     tDegenerated = 352,
+     tRecursive = 353,
+     tRotate = 354,
+     tTranslate = 355,
+     tSymmetry = 356,
+     tDilate = 357,
+     tExtrude = 358,
+     tLevelset = 359,
+     tAffine = 360,
+     tRecombine = 361,
+     tSmoother = 362,
+     tSplit = 363,
+     tDelete = 364,
+     tCoherence = 365,
+     tIntersect = 366,
+     tMeshAlgorithm = 367,
+     tReverse = 368,
+     tLayers = 369,
+     tScaleLast = 370,
+     tHole = 371,
+     tAlias = 372,
+     tAliasWithOptions = 373,
+     tCopyOptions = 374,
+     tQuadTriAddVerts = 375,
+     tQuadTriNoNewVerts = 376,
+     tQuadTriSngl = 377,
+     tQuadTriDbl = 378,
+     tRecombLaterals = 379,
+     tTransfQuadTri = 380,
+     tText2D = 381,
+     tText3D = 382,
+     tInterpolationScheme = 383,
+     tTime = 384,
+     tCombine = 385,
+     tBSpline = 386,
+     tBezier = 387,
+     tNurbs = 388,
+     tNurbsOrder = 389,
+     tNurbsKnots = 390,
+     tColor = 391,
+     tColorTable = 392,
+     tFor = 393,
+     tIn = 394,
+     tEndFor = 395,
+     tIf = 396,
+     tEndIf = 397,
+     tExit = 398,
+     tAbort = 399,
+     tField = 400,
+     tReturn = 401,
+     tCall = 402,
+     tMacro = 403,
+     tShow = 404,
+     tHide = 405,
+     tGetValue = 406,
+     tGetEnv = 407,
+     tGetString = 408,
+     tGetNumber = 409,
+     tHomology = 410,
+     tCohomology = 411,
+     tBetti = 412,
+     tSetOrder = 413,
+     tExists = 414,
+     tFileExists = 415,
+     tGMSH_MAJOR_VERSION = 416,
+     tGMSH_MINOR_VERSION = 417,
+     tGMSH_PATCH_VERSION = 418,
+     tGmshExecutableName = 419,
+     tSetPartition = 420,
+     tAFFECTPLUS = 421,
+     tAFFECTMINUS = 422,
+     tAFFECTTIMES = 423,
+     tAFFECTDIVIDE = 424,
+     tOR = 425,
+     tAND = 426,
+     tEQUAL = 427,
+     tNOTEQUAL = 428,
+     tLESSOREQUAL = 429,
+     tGREATEROREQUAL = 430,
+     tPLUSPLUS = 431,
+     tMINUSMINUS = 432,
+     UNARYPREC = 433
+   };
  #endif
  
- 
+ /* Value type.  */
  #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
++<<<<<<< HEAD
 +typedef union YYSTYPE
 +<<<<<<< HEAD
 +#line 100 "Gmsh.y"
 +=======
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 
+ union YYSTYPE
++>>>>>>> upstream/2.10.1+dfsg1
  {
- /* Line 387 of yacc.c  */
- #line 99 "Gmsh.y"
+ #line 105 "Gmsh.y" /* yacc.c:355  */
  
    char *c;
    int i;
@@@ -747,20 -402,12 +763,23 @@@
    double v[5];
    Shape s;
    List_T *l;
 +<<<<<<< HEAD
 +}
 +/* Line 193 of yacc.c.  */
 +#line 545 "Gmsh.tab.cpp"
 +	YYSTYPE;
 +=======
  
+ #line 407 "Gmsh.tab.cpp" /* yacc.c:355  */
+ };
  
- /* Line 387 of yacc.c  */
- #line 397 "Gmsh.tab.cpp"
- } YYSTYPE;
+ typedef union YYSTYPE YYSTYPE;
  # define YYSTYPE_IS_TRIVIAL 1
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++=======
++>>>>>>> upstream/2.10.1+dfsg1
  # define YYSTYPE_IS_DECLARED 1
  #endif
  
@@@ -784,14 -420,7 +792,18 @@@ int gmsh_yyparse (void)
  
  /* Copy the second part of user declarations.  */
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +
 +/* Line 216 of yacc.c.  */
 +#line 558 "Gmsh.tab.cpp"
 +=======
 +/* Line 390 of yacc.c  */
 +#line 425 "Gmsh.tab.cpp"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 424 "Gmsh.tab.cpp" /* yacc.c:358  */
++>>>>>>> upstream/2.10.1+dfsg1
  
  #ifdef short
  # undef short
@@@ -1020,70 -662,42 +1045,89 @@@ union yyallo
  /* YYFINAL -- State number of the termination state.  */
  #define YYFINAL  5
  /* YYLAST -- Last index in YYTABLE.  */
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#define YYLAST   8039
 +
 +/* YYNTOKENS -- Number of terminals.  */
 +#define YYNTOKENS  187
 +/* YYNNTS -- Number of nonterminals.  */
 +#define YYNNTS  97
 +/* YYNRULES -- Number of rules.  */
 +#define YYNRULES  466
 +/* YYNRULES -- Number of states.  */
 +#define YYNSTATES  1613
 +
 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 +#define YYUNDEFTOK  2
 +#define YYMAXUTOK   421
 +=======
 +#define YYLAST   9474
++=======
+ #define YYLAST   9711
++>>>>>>> upstream/2.10.1+dfsg1
  
  /* YYNTOKENS -- Number of terminals.  */
- #define YYNTOKENS  191
+ #define YYNTOKENS  199
  /* YYNNTS -- Number of nonterminals.  */
- #define YYNNTS  97
+ #define YYNNTS  98
  /* YYNRULES -- Number of rules.  */
- #define YYNRULES  485
- /* YYNRULES -- Number of states.  */
- #define YYNSTATES  1715
+ #define YYNRULES  511
+ /* YYNSTATES -- Number of states.  */
+ #define YYNSTATES  1812
  
- /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+ /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+    by yylex, with out-of-bounds checking.  */
  #define YYUNDEFTOK  2
++<<<<<<< HEAD
 +#define YYMAXUTOK   425
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #define YYMAXUTOK   433
++>>>>>>> upstream/2.10.1+dfsg1
  
- #define YYTRANSLATE(YYX)						\
+ #define YYTRANSLATE(YYX)                                                \
    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
  
- /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+ /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+    as returned by yylex, without out-of-bounds checking.  */
  static const yytype_uint8 yytranslate[] =
  {
         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +       2,     2,     2,   172,     2,   182,     2,   171,     2,     2,
 +     177,   178,   169,   167,   183,   168,   181,   170,     2,     2,
 +       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +     163,     2,   164,   158,     2,     2,     2,     2,     2,     2,
 +       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +       2,   179,     2,   180,   176,     2,     2,     2,     2,     2,
 +       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 +       2,     2,     2,   184,     2,   185,   186,     2,     2,     2,
 +=======
 +       2,     2,     2,   176,     2,   186,     2,   175,     2,     2,
 +     181,   182,   173,   171,   187,   172,   185,   174,     2,     2,
++=======
+        2,     2,     2,   184,     2,   194,     2,   183,     2,     2,
+      189,   190,   181,   179,   195,   180,   193,   182,     2,     2,
++>>>>>>> upstream/2.10.1+dfsg1
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-      167,     2,   168,   162,     2,     2,     2,     2,     2,     2,
+      175,     2,   177,   170,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-        2,   183,     2,   184,   180,     2,     2,     2,     2,     2,
+        2,   191,     2,   192,   188,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++<<<<<<< HEAD
 +       2,     2,     2,   188,     2,   189,   190,     2,     2,     2,
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        2,     2,     2,   196,     2,   197,   198,     2,     2,     2,
++>>>>>>> upstream/2.10.1+dfsg1
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@@ -1112,760 -726,67 +1156,824 @@@
       125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
       135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
       145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +     155,   156,   157,   159,   160,   161,   162,   165,   166,   173,
 +     174,   175
 +=======
 +     155,   156,   157,   158,   159,   160,   161,   163,   164,   165,
 +     166,   169,   170,   177,   178,   179
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +#if YYDEBUG
 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
 +   YYRHS.  */
 +static const yytype_uint16 yyprhs[] =
 +{
 +       0,     0,     3,     5,     8,     9,    12,    14,    16,    18,
 +      20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
 +      40,    42,    44,    47,    53,    59,    67,    75,    83,    93,
 +     100,   107,   114,   123,   124,   127,   130,   133,   136,   139,
 +     141,   145,   147,   151,   152,   153,   164,   166,   170,   171,
 +     185,   187,   191,   192,   208,   217,   232,   233,   240,   242,
 +     244,   246,   248,   250,   252,   254,   256,   258,   260,   262,
 +<<<<<<< HEAD
 +     268,   274,   279,   286,   294,   302,   310,   320,   330,   334,
 +     341,   348,   353,   360,   370,   377,   387,   393,   402,   411,
 +     423,   430,   440,   446,   454,   464,   474,   486,   494,   504,
 +     514,   515,   517,   518,   522,   528,   529,   539,   545,   546,
 +     556,   557,   561,   565,   571,   572,   575,   579,   585,   589,
 +     590,   593,   597,   601,   607,   609,   611,   612,   618,   619,
 +     622,   630,   631,   641,   648,   656,   661,   669,   678,   687,
 +     695,   703,   715,   724,   733,   734,   744,   753,   763,   767,
 +     772,   783,   791,   799,   808,   817,   830,   831,   841,   850,
 +     858,   867,   868,   878,   884,   896,   902,   912,   922,   927,
 +     937,   947,   949,   951,   952,   955,   962,   969,   976,   983,
 +     992,  1003,  1018,  1035,  1048,  1057,  1066,  1073,  1088,  1093,
 +    1100,  1107,  1111,  1116,  1122,  1129,  1133,  1137,  1142,  1148,
 +    1153,  1159,  1163,  1171,  1179,  1183,  1191,  1195,  1198,  1201,
 +    1204,  1207,  1223,  1226,  1229,  1232,  1235,  1238,  1255,  1259,
 +    1266,  1275,  1284,  1295,  1297,  1300,  1302,  1306,  1311,  1313,
 +    1319,  1331,  1345,  1346,  1354,  1355,  1369,  1370,  1386,  1387,
 +    1394,  1403,  1412,  1421,  1434,  1447,  1460,  1475,  1490,  1505,
 +    1506,  1519,  1520,  1533,  1534,  1547,  1548,  1565,  1566,  1583,
 +    1584,  1601,  1602,  1621,  1622,  1641,  1642,  1661,  1663,  1666,
 +    1672,  1680,  1690,  1693,  1696,  1699,  1703,  1706,  1710,  1713,
 +    1717,  1720,  1724,  1734,  1741,  1742,  1746,  1747,  1749,  1750,
 +    1753,  1754,  1757,  1765,  1772,  1781,  1787,  1791,  1799,  1805,
 +    1810,  1817,  1824,  1837,  1848,  1859,  1870,  1881,  1892,  1897,
 +    1902,  1907,  1912,  1917,  1920,  1924,  1931,  1933,  1935,  1937,
 +    1940,  1946,  1954,  1965,  1967,  1971,  1974,  1977,  1980,  1984,
 +    1988,  1992,  1996,  2000,  2004,  2008,  2012,  2016,  2020,  2024,
 +    2028,  2032,  2036,  2042,  2047,  2052,  2057,  2062,  2067,  2072,
 +    2077,  2082,  2087,  2092,  2099,  2104,  2109,  2114,  2119,  2124,
 +    2129,  2134,  2141,  2148,  2155,  2160,  2162,  2164,  2166,  2168,
 +    2170,  2172,  2174,  2176,  2178,  2180,  2181,  2188,  2190,  2195,
 +    2200,  2205,  2210,  2215,  2218,  2224,  2230,  2234,  2241,  2246,
 +    2254,  2261,  2268,  2275,  2280,  2282,  2285,  2288,  2292,  2296,
 +    2308,  2318,  2326,  2334,  2336,  2340,  2342,  2344,  2347,  2351,
 +    2356,  2362,  2364,  2366,  2369,  2373,  2377,  2383,  2388,  2391,
 +    2394,  2397,  2400,  2406,  2412,  2418,  2424,  2426,  2428,  2432,
 +    2437,  2444,  2446,  2448,  2452,  2456,  2466,  2474,  2476,  2482,
 +    2486,  2493,  2495,  2499,  2501,  2503,  2507,  2514,  2516,  2518,
 +    2520,  2525,  2532,  2539,  2544,  2549,  2558,  2563,  2568,  2575,
 +    2576,  2583,  2585,  2589,  2595,  2601,  2603
 +=======
 +     268,   274,   279,   286,   293,   301,   309,   317,   327,   337,
 +     341,   348,   355,   360,   367,   377,   384,   394,   400,   409,
 +     418,   430,   437,   447,   453,   461,   471,   481,   493,   501,
 +     511,   521,   522,   524,   525,   529,   535,   536,   546,   552,
 +     553,   563,   564,   568,   572,   578,   579,   582,   586,   592,
 +     596,   597,   600,   604,   608,   614,   616,   618,   620,   622,
 +     624,   626,   628,   630,   631,   637,   638,   641,   649,   658,
 +     665,   673,   678,   686,   695,   704,   712,   720,   732,   741,
 +     750,   759,   768,   778,   782,   787,   798,   806,   814,   823,
 +     832,   845,   854,   863,   871,   880,   889,   895,   907,   913,
 +     923,   933,   938,   948,   958,   960,   962,   963,   966,   973,
 +     980,   987,   994,  1003,  1014,  1029,  1046,  1059,  1068,  1077,
 +    1084,  1099,  1104,  1111,  1118,  1122,  1127,  1133,  1140,  1144,
 +    1148,  1153,  1159,  1164,  1170,  1174,  1180,  1188,  1196,  1200,
 +    1208,  1212,  1215,  1218,  1221,  1224,  1240,  1243,  1246,  1249,
 +    1252,  1255,  1272,  1276,  1283,  1292,  1301,  1312,  1314,  1317,
 +    1319,  1323,  1328,  1330,  1336,  1348,  1362,  1363,  1371,  1372,
 +    1386,  1387,  1403,  1404,  1411,  1420,  1429,  1438,  1451,  1464,
 +    1477,  1492,  1507,  1522,  1523,  1536,  1537,  1550,  1551,  1564,
 +    1565,  1582,  1583,  1600,  1601,  1618,  1619,  1638,  1639,  1658,
 +    1659,  1678,  1680,  1683,  1689,  1697,  1707,  1710,  1713,  1716,
 +    1720,  1723,  1727,  1730,  1734,  1737,  1741,  1751,  1758,  1759,
 +    1763,  1764,  1766,  1767,  1770,  1771,  1774,  1775,  1778,  1786,
 +    1793,  1802,  1808,  1812,  1820,  1826,  1831,  1838,  1845,  1859,
 +    1870,  1881,  1892,  1903,  1914,  1919,  1924,  1929,  1934,  1939,
 +    1942,  1946,  1953,  1955,  1957,  1959,  1962,  1968,  1976,  1987,
 +    1989,  1993,  1996,  1999,  2002,  2006,  2010,  2014,  2018,  2022,
 +    2026,  2030,  2034,  2038,  2042,  2046,  2050,  2054,  2058,  2064,
 +    2069,  2074,  2079,  2084,  2089,  2094,  2099,  2104,  2109,  2114,
 +    2121,  2126,  2131,  2136,  2141,  2146,  2151,  2156,  2163,  2170,
 +    2177,  2182,  2184,  2186,  2188,  2190,  2192,  2194,  2196,  2198,
 +    2200,  2202,  2203,  2210,  2212,  2217,  2222,  2227,  2232,  2237,
 +    2240,  2246,  2252,  2256,  2263,  2268,  2276,  2283,  2290,  2297,
 +    2304,  2309,  2311,  2314,  2317,  2321,  2325,  2337,  2347,  2355,
 +    2363,  2365,  2369,  2371,  2373,  2376,  2380,  2385,  2391,  2393,
 +    2395,  2398,  2402,  2406,  2412,  2417,  2420,  2423,  2426,  2429,
 +    2433,  2437,  2441,  2445,  2451,  2457,  2463,  2469,  2486,  2503,
 +    2520,  2537,  2539,  2541,  2545,  2549,  2554,  2561,  2568,  2570,
 +    2572,  2576,  2580,  2590,  2598,  2600,  2606,  2610,  2617,  2619,
 +    2623,  2625,  2627,  2631,  2638,  2640,  2642,  2644,  2649,  2656,
 +    2661,  2666,  2671,  2680,  2685,  2694,  2699,  2706,  2711,  2712,
 +    2719,  2721,  2725,  2731,  2737,  2739
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 +static const yytype_int16 yyrhs[] =
 +{
 +<<<<<<< HEAD
 +     188,     0,    -1,   189,    -1,     1,     6,    -1,    -1,   189,
 +     190,    -1,   193,    -1,   192,    -1,   213,    -1,   227,    -1,
 +     232,    -1,   236,    -1,   237,    -1,   238,    -1,   241,    -1,
 +     261,    -1,   262,    -1,   240,    -1,   239,    -1,   235,    -1,
 +     264,    -1,   164,    -1,   164,   164,    -1,    37,   177,   278,
 +     178,     6,    -1,    38,   177,   278,   178,     6,    -1,    37,
 +     177,   278,   178,   191,   278,     6,    -1,    37,   177,   278,
 +     183,   274,   178,     6,    -1,    38,   177,   278,   183,   274,
 +     178,     6,    -1,    37,   177,   278,   183,   274,   178,   191,
 +     278,     6,    -1,     4,   278,   184,   194,   185,     6,    -1,
 +     108,     4,   179,   265,   180,     6,    -1,   109,     4,   179,
 +     265,   180,     6,    -1,   110,     4,   179,   265,   183,   265,
 +     180,     6,    -1,    -1,   194,   197,    -1,   194,   201,    -1,
 +     194,   204,    -1,   194,   206,    -1,   194,   207,    -1,   265,
 +      -1,   195,   183,   265,    -1,   265,    -1,   196,   183,   265,
 +      -1,    -1,    -1,     4,   198,   177,   195,   178,   199,   184,
 +     196,   185,     6,    -1,   278,    -1,   200,   183,   278,    -1,
 +      -1,   117,   177,   265,   183,   265,   183,   265,   178,   202,
 +     184,   200,   185,     6,    -1,   278,    -1,   203,   183,   278,
 +      -1,    -1,   118,   177,   265,   183,   265,   183,   265,   183,
 +     265,   178,   205,   184,   203,   185,     6,    -1,   119,   184,
 +     270,   185,   184,   270,   185,     6,    -1,   119,   184,   270,
 +     185,   184,   270,   185,   184,   270,   185,   184,   270,   185,
 +       6,    -1,    -1,   120,   208,   184,   196,   185,     6,    -1,
 +       7,    -1,   157,    -1,   156,    -1,   155,    -1,   154,    -1,
 +     175,    -1,   174,    -1,   177,    -1,   179,    -1,   178,    -1,
 +     180,    -1,    60,   179,   215,   180,     6,    -1,    61,   179,
 +     218,   180,     6,    -1,   283,   209,   271,     6,    -1,     4,
 +     179,   180,   209,   271,     6,    -1,     4,   179,   265,   180,
 +     209,   265,     6,    -1,     4,   177,   265,   178,   209,   265,
 +       6,    -1,   282,   179,   265,   180,   209,   265,     6,    -1,
 +       4,   211,   184,   274,   185,   212,   209,   271,     6,    -1,
 +     282,   177,   184,   274,   185,   178,   209,   271,     6,    -1,
 +     283,   210,     6,    -1,     4,   179,   265,   180,   210,     6,
 +      -1,   282,   179,   265,   180,   210,     6,    -1,   283,     7,
 +     279,     6,    -1,     4,   181,     4,     7,   279,     6,    -1,
 +       4,   179,   265,   180,   181,     4,     7,   279,     6,    -1,
 +       4,   181,     4,   209,   265,     6,    -1,     4,   179,   265,
 +     180,   181,     4,   209,   265,     6,    -1,     4,   181,     4,
 +     210,     6,    -1,     4,   179,   265,   180,   181,     4,   210,
 +       6,    -1,     4,   181,   127,   181,     4,     7,   275,     6,
 +      -1,     4,   179,   265,   180,   181,   127,   181,     4,     7,
 +     275,     6,    -1,     4,   181,   128,     7,   276,     6,    -1,
 +       4,   179,   265,   180,   181,   128,     7,   276,     6,    -1,
 +       4,   136,     7,   265,     6,    -1,   136,   179,   265,   180,
 +       7,     4,     6,    -1,   136,   179,   265,   180,   181,     4,
 +       7,   265,     6,    -1,   136,   179,   265,   180,   181,     4,
 +       7,   279,     6,    -1,   136,   179,   265,   180,   181,     4,
 +       7,   184,   274,   185,     6,    -1,   136,   179,   265,   180,
 +     181,     4,     6,    -1,    88,   177,     4,   178,   181,     4,
 +       7,   265,     6,    -1,    88,   177,     4,   178,   181,     4,
 +       7,   279,     6,    -1,    -1,   183,    -1,    -1,   215,   214,
 +     283,    -1,   215,   214,   283,     7,   265,    -1,    -1,   215,
 +     214,   283,     7,   184,   265,   216,   220,   185,    -1,   215,
 +     214,   283,     7,   279,    -1,    -1,   215,   214,   283,     7,
 +     184,   279,   217,   222,   185,    -1,    -1,   218,   214,   278,
 +      -1,   265,     7,   279,    -1,   219,   183,   265,     7,   279,
 +      -1,    -1,   220,   221,    -1,   183,     4,   271,    -1,   183,
 +       4,   184,   219,   185,    -1,   183,     4,   279,    -1,    -1,
 +     222,   223,    -1,   183,     4,   265,    -1,   183,     4,   279,
 +      -1,   183,     4,   184,   281,   185,    -1,   265,    -1,   279,
 +      -1,    -1,   130,    68,   184,   265,   185,    -1,    -1,    80,
 +     268,    -1,    64,   177,   265,   178,     7,   268,     6,    -1,
 +      -1,    84,    64,   228,   177,   224,   178,     7,   271,     6,
 +      -1,    73,    74,   271,     7,   265,     6,    -1,    67,   177,
 +     265,   178,     7,   271,     6,    -1,    89,    67,   271,     6,
 +      -1,    71,   177,   265,   178,     7,   271,     6,    -1,    65,
 +     177,   265,   178,     7,   271,   226,     6,    -1,    66,   177,
 +     265,   178,     7,   271,   226,     6,    -1,   122,   177,   265,
 +     178,     7,   271,     6,    -1,   123,   177,   265,   178,     7,
 +     271,     6,    -1,   124,   177,   265,   178,     7,   271,   126,
 +     271,   125,   265,     6,    -1,    67,     4,   177,   265,   178,
 +       7,   271,     6,    -1,    85,    67,   177,   265,   178,     7,
 +     271,     6,    -1,    -1,    84,    67,   229,   177,   224,   178,
 +       7,   271,     6,    -1,    80,    70,   177,   265,   178,     7,
 +     271,     6,    -1,    81,    70,   177,   265,   178,     7,   271,
 +     225,     6,    -1,    12,    13,     6,    -1,    13,    70,   265,
 +       6,    -1,    75,    70,   177,   265,   178,     7,     5,     5,
 +       5,     6,    -1,    68,   177,   265,   178,     7,   271,     6,
 +      -1,    69,   177,   265,   178,     7,   271,     6,    -1,    70,
 +       4,   177,   265,   178,     7,   271,     6,    -1,    85,    70,
 +     177,   265,   178,     7,   271,     6,    -1,    85,    70,   177,
 +     265,   178,     7,   271,     4,   184,   270,   185,     6,    -1,
 +      -1,    84,    70,   230,   177,   224,   178,     7,   271,     6,
 +      -1,    83,    72,   177,   265,   178,     7,   271,     6,    -1,
 +      72,   177,   265,   178,     7,   271,     6,    -1,    85,    72,
 +     177,   265,   178,     7,   271,     6,    -1,    -1,    84,    72,
 +     231,   177,   224,   178,     7,   271,     6,    -1,    92,   268,
 +     184,   233,   185,    -1,    91,   184,   268,   183,   268,   183,
 +     265,   185,   184,   233,   185,    -1,    93,   268,   184,   233,
 +     185,    -1,    94,   184,   268,   183,   265,   185,   184,   233,
 +     185,    -1,    94,   184,   268,   183,   268,   185,   184,   233,
 +     185,    -1,     4,   184,   233,   185,    -1,   102,    67,   184,
 +     274,   185,    70,   184,   265,   185,    -1,    99,    67,   177,
 +     265,   178,   184,   274,   185,     6,    -1,   234,    -1,   232,
 +      -1,    -1,   234,   227,    -1,   234,    64,   184,   274,   185,
 +       6,    -1,   234,    67,   184,   274,   185,     6,    -1,   234,
 +      70,   184,   274,   185,     6,    -1,   234,    72,   184,   274,
 +     185,     6,    -1,    96,    80,   177,   265,   178,     7,   271,
 +       6,    -1,    96,    64,   177,   265,   178,     7,   184,   270,
 +     185,     6,    -1,    96,    80,   177,   265,   178,     7,   184,
 +     268,   183,   268,   183,   274,   185,     6,    -1,    96,    80,
 +     177,   265,   178,     7,   184,   268,   183,   268,   183,   268,
 +     183,   274,   185,     6,    -1,    96,    68,   177,   265,   178,
 +       7,   184,   268,   183,   274,   185,     6,    -1,    96,     4,
 +     177,   265,   178,     7,   271,     6,    -1,    96,     4,   177,
 +     265,   178,     7,     5,     6,    -1,    96,     4,   184,   265,
 +     185,     6,    -1,    96,     4,   177,   265,   178,     7,   184,
 +     268,   183,   268,   183,   274,   185,     6,    -1,   100,   184,
 +     234,   185,    -1,   100,   136,   179,   265,   180,     6,    -1,
 +     100,     4,   179,   265,   180,     6,    -1,   100,     4,     6,
 +      -1,   100,     4,     4,     6,    -1,   127,   275,   184,   234,
 +     185,    -1,    90,   127,   275,   184,   234,   185,    -1,   140,
 +       5,     6,    -1,   141,     5,     6,    -1,   140,   184,   234,
 +     185,    -1,    90,   140,   184,   234,   185,    -1,   141,   184,
 +     234,   185,    -1,    90,   141,   184,   234,   185,    -1,     4,
 +     279,     6,    -1,     4,     4,   179,   265,   180,   278,     6,
 +      -1,     4,     4,     4,   179,   265,   180,     6,    -1,     4,
 +     265,     6,    -1,    88,   177,     4,   178,   181,     4,     6,
 +      -1,   121,     4,     6,    -1,   134,     6,    -1,   135,     6,
 +      -1,    53,     6,    -1,    48,     6,    -1,    48,   184,   265,
 +     183,   265,   183,   265,   183,   265,   183,   265,   183,   265,
 +     185,     6,    -1,    49,     6,    -1,    50,     6,    -1,    57,
 +       6,    -1,    58,     6,    -1,    77,     6,    -1,    78,   184,
 +     274,   185,   184,   274,   185,   184,   270,   185,   184,   265,
 +     183,   265,   185,     6,    -1,   148,   265,     6,    -1,   129,
 +     177,   265,     8,   265,   178,    -1,   129,   177,   265,     8,
 +     265,     8,   265,   178,    -1,   129,     4,   130,   184,   265,
 +       8,   265,   185,    -1,   129,     4,   130,   184,   265,     8,
 +     265,     8,   265,   185,    -1,   131,    -1,   139,     4,    -1,
 +     137,    -1,   138,     4,     6,    -1,   132,   177,   265,   178,
 +      -1,   133,    -1,    95,   268,   184,   234,   185,    -1,    95,
 +     184,   268,   183,   268,   183,   265,   185,   184,   234,   185,
 +      -1,    95,   184,   268,   183,   268,   183,   268,   183,   265,
 +     185,   184,   234,   185,    -1,    -1,    95,   268,   184,   234,
 +     242,   255,   185,    -1,    -1,    95,   184,   268,   183,   268,
 +     183,   265,   185,   184,   234,   243,   255,   185,    -1,    -1,
 +      95,   184,   268,   183,   268,   183,   268,   183,   265,   185,
 +     184,   234,   244,   255,   185,    -1,    -1,    95,   184,   234,
 +     245,   255,   185,    -1,    95,    64,   184,   265,   183,   268,
 +     185,     6,    -1,    95,    67,   184,   265,   183,   268,   185,
 +       6,    -1,    95,    70,   184,   265,   183,   268,   185,     6,
 +      -1,    95,    64,   184,   265,   183,   268,   183,   268,   183,
 +     265,   185,     6,    -1,    95,    67,   184,   265,   183,   268,
 +     183,   268,   183,   265,   185,     6,    -1,    95,    70,   184,
 +     265,   183,   268,   183,   268,   183,   265,   185,     6,    -1,
 +      95,    64,   184,   265,   183,   268,   183,   268,   183,   268,
 +     183,   265,   185,     6,    -1,    95,    67,   184,   265,   183,
 +     268,   183,   268,   183,   268,   183,   265,   185,     6,    -1,
 +      95,    70,   184,   265,   183,   268,   183,   268,   183,   268,
 +     183,   265,   185,     6,    -1,    -1,    95,    64,   184,   265,
 +     183,   268,   185,   246,   184,   255,   185,     6,    -1,    -1,
 +      95,    67,   184,   265,   183,   268,   185,   247,   184,   255,
 +     185,     6,    -1,    -1,    95,    70,   184,   265,   183,   268,
 +     185,   248,   184,   255,   185,     6,    -1,    -1,    95,    64,
 +     184,   265,   183,   268,   183,   268,   183,   265,   185,   249,
 +     184,   255,   185,     6,    -1,    -1,    95,    67,   184,   265,
 +     183,   268,   183,   268,   183,   265,   185,   250,   184,   255,
 +     185,     6,    -1,    -1,    95,    70,   184,   265,   183,   268,
 +     183,   268,   183,   265,   185,   251,   184,   255,   185,     6,
 +      -1,    -1,    95,    64,   184,   265,   183,   268,   183,   268,
 +     183,   268,   183,   265,   185,   252,   184,   255,   185,     6,
 +      -1,    -1,    95,    67,   184,   265,   183,   268,   183,   268,
 +     183,   268,   183,   265,   185,   253,   184,   255,   185,     6,
 +      -1,    -1,    95,    70,   184,   265,   183,   268,   183,   268,
 +     183,   268,   183,   265,   185,   254,   184,   255,   185,     6,
 +      -1,   256,    -1,   255,   256,    -1,   105,   184,   265,   185,
 +       6,    -1,   105,   184,   271,   183,   271,   185,     6,    -1,
 +     105,   184,   271,   183,   271,   183,   271,   185,     6,    -1,
 +     106,     6,    -1,    97,     6,    -1,   113,     6,    -1,   113,
 +     115,     6,    -1,   114,     6,    -1,   114,   115,     6,    -1,
 +     111,     6,    -1,   111,   115,     6,    -1,   112,     6,    -1,
 +     112,   115,     6,    -1,   107,   177,   265,   178,     7,   271,
 +      87,   265,     6,    -1,    87,     4,   179,   265,   180,     6,
 +      -1,    -1,    87,     4,   265,    -1,    -1,     4,    -1,    -1,
 +       7,   271,    -1,    -1,     7,   265,    -1,    82,    67,   272,
 +       7,   265,   257,     6,    -1,    82,    70,   272,   259,   258,
 +       6,    -1,    76,    70,   184,   265,   185,     7,   271,     6,
 +      -1,    82,    72,   272,   259,     6,    -1,   116,   272,     6,
 +      -1,   103,    70,   184,   274,   185,   265,     6,    -1,    97,
 +      70,   272,   260,     6,    -1,    97,    72,   272,     6,    -1,
 +      98,    70,   271,     7,   265,     6,    -1,    86,    67,   271,
 +       7,   271,     6,    -1,    86,    70,   265,   184,   274,   185,
 +       7,   265,   184,   274,   185,     6,    -1,    64,   184,   274,
 +     185,   130,    70,   184,   265,   185,     6,    -1,    67,   184,
 +     274,   185,   130,    70,   184,   265,   185,     6,    -1,    64,
 +     184,   274,   185,   130,    72,   184,   265,   185,     6,    -1,
 +      67,   184,   274,   185,   130,    72,   184,   265,   185,     6,
 +      -1,    70,   184,   274,   185,   130,    72,   184,   265,   185,
 +       6,    -1,   104,    70,   272,     6,    -1,   104,    67,   272,
 +       6,    -1,    79,    64,   272,     6,    -1,    79,    67,   272,
 +       6,    -1,    79,    70,   272,     6,    -1,   101,     6,    -1,
 +     101,     4,     6,    -1,   101,    64,   184,   274,   185,     6,
 +      -1,   145,    -1,   146,    -1,   147,    -1,   263,     6,    -1,
 +     263,   184,   271,   185,     6,    -1,   263,   184,   271,   183,
 +     271,   185,     6,    -1,   263,   177,   271,   178,   184,   271,
 +     183,   271,   185,     6,    -1,   266,    -1,   177,   265,   178,
 +      -1,   168,   265,    -1,   167,   265,    -1,   172,   265,    -1,
 +     265,   168,   265,    -1,   265,   167,   265,    -1,   265,   169,
 +     265,    -1,   265,   170,   265,    -1,   265,   171,   265,    -1,
 +     265,   176,   265,    -1,   265,   163,   265,    -1,   265,   164,
 +     265,    -1,   265,   166,   265,    -1,   265,   165,   265,    -1,
 +     265,   162,   265,    -1,   265,   161,   265,    -1,   265,   160,
 +     265,    -1,   265,   159,   265,    -1,   265,   158,   265,     8,
 +     265,    -1,    14,   211,   265,   212,    -1,    15,   211,   265,
 +     212,    -1,    16,   211,   265,   212,    -1,    17,   211,   265,
 +     212,    -1,    18,   211,   265,   212,    -1,    19,   211,   265,
 +     212,    -1,    20,   211,   265,   212,    -1,    21,   211,   265,
 +     212,    -1,    22,   211,   265,   212,    -1,    24,   211,   265,
 +     212,    -1,    25,   211,   265,   183,   265,   212,    -1,    26,
 +     211,   265,   212,    -1,    27,   211,   265,   212,    -1,    28,
 +     211,   265,   212,    -1,    29,   211,   265,   212,    -1,    30,
 +     211,   265,   212,    -1,    31,   211,   265,   212,    -1,    32,
 +     211,   265,   212,    -1,    33,   211,   265,   183,   265,   212,
 +      -1,    34,   211,   265,   183,   265,   212,    -1,    35,   211,
 +     265,   183,   265,   212,    -1,    23,   211,   265,   212,    -1,
 +       3,    -1,     9,    -1,    10,    -1,    11,    -1,   151,    -1,
 +     152,    -1,   153,    -1,    54,    -1,    55,    -1,    56,    -1,
 +      -1,    62,   211,   265,   267,   220,   212,    -1,   283,    -1,
 +       4,   179,   265,   180,    -1,   282,   179,   265,   180,    -1,
 +     149,   177,   283,   178,    -1,   150,   177,   279,   178,    -1,
 +     182,   283,   179,   180,    -1,   283,   210,    -1,     4,   179,
 +     265,   180,   210,    -1,   282,   179,   265,   180,   210,    -1,
 +       4,   181,     4,    -1,     4,   179,   265,   180,   181,     4,
 +      -1,     4,   181,     4,   210,    -1,     4,   179,   265,   180,
 +     181,     4,   210,    -1,   142,   177,   278,   183,   265,   178,
 +      -1,    45,   177,   278,   183,   278,   178,    -1,    46,   177,
 +     278,   183,   278,   178,    -1,    47,   177,   281,   178,    -1,
 +     269,    -1,   168,   268,    -1,   167,   268,    -1,   268,   168,
 +     268,    -1,   268,   167,   268,    -1,   184,   265,   183,   265,
 +     183,   265,   183,   265,   183,   265,   185,    -1,   184,   265,
 +     183,   265,   183,   265,   183,   265,   185,    -1,   184,   265,
 +     183,   265,   183,   265,   185,    -1,   177,   265,   183,   265,
 +     183,   265,   178,    -1,   271,    -1,   270,   183,   271,    -1,
 +     265,    -1,   273,    -1,   184,   185,    -1,   184,   274,   185,
 +      -1,   168,   184,   274,   185,    -1,   265,   169,   184,   274,
 +     185,    -1,   271,    -1,     5,    -1,   168,   273,    -1,   265,
 +     169,   273,    -1,   265,     8,   265,    -1,   265,     8,   265,
 +       8,   265,    -1,    64,   184,   265,   185,    -1,    64,     5,
 +      -1,    67,     5,    -1,    70,     5,    -1,    72,     5,    -1,
 +      84,    64,   184,   274,   185,    -1,    84,    67,   184,   274,
 +     185,    -1,    84,    70,   184,   274,   185,    -1,    84,    72,
 +     184,   274,   185,    -1,   232,    -1,   241,    -1,     4,   211,
 +     212,    -1,    36,   179,     4,   180,    -1,     4,   211,   184,
 +     274,   185,   212,    -1,   265,    -1,   273,    -1,   274,   183,
 +     265,    -1,   274,   183,   273,    -1,   184,   265,   183,   265,
 +     183,   265,   183,   265,   185,    -1,   184,   265,   183,   265,
 +     183,   265,   185,    -1,     4,    -1,     4,   181,   127,   181,
 +       4,    -1,   184,   277,   185,    -1,     4,   179,   265,   180,
 +     181,   128,    -1,   275,    -1,   277,   183,   275,    -1,   279,
 +      -1,   283,    -1,     4,   181,     4,    -1,     4,   179,   265,
 +     180,   181,     4,    -1,     5,    -1,    51,    -1,    52,    -1,
 +     143,   177,   278,   178,    -1,   144,   177,   278,   183,   278,
 +     178,    -1,    41,   211,   278,   183,   278,   212,    -1,    42,
 +     177,   278,   178,    -1,    43,   177,   278,   178,    -1,    44,
 +     177,   278,   183,   278,   183,   278,   178,    -1,    39,   211,
 +     281,   212,    -1,    40,   211,   278,   212,    -1,    40,   211,
 +     278,   183,   274,   212,    -1,    -1,    63,   211,   279,   280,
 +     222,   212,    -1,   278,    -1,   281,   183,   278,    -1,     4,
 +     186,   184,   265,   185,    -1,   282,   186,   184,   265,   185,
 +      -1,     4,    -1,   282,    -1
 +=======
 +     192,     0,    -1,   193,    -1,     1,     6,    -1,    -1,   193,
 +     194,    -1,   197,    -1,   196,    -1,   217,    -1,   234,    -1,
 +     235,    -1,   239,    -1,   240,    -1,   241,    -1,   244,    -1,
 +     265,    -1,   266,    -1,   243,    -1,   242,    -1,   238,    -1,
 +     268,    -1,   168,    -1,   168,   168,    -1,    37,   181,   282,
 +     182,     6,    -1,    38,   181,   282,   182,     6,    -1,    37,
 +     181,   282,   182,   195,   282,     6,    -1,    37,   181,   282,
 +     187,   278,   182,     6,    -1,    38,   181,   282,   187,   278,
 +     182,     6,    -1,    37,   181,   282,   187,   278,   182,   195,
 +     282,     6,    -1,     4,   282,   188,   198,   189,     6,    -1,
 +     112,     4,   183,   269,   184,     6,    -1,   113,     4,   183,
 +     269,   184,     6,    -1,   114,     4,   183,   269,   187,   269,
 +     184,     6,    -1,    -1,   198,   201,    -1,   198,   205,    -1,
 +     198,   208,    -1,   198,   210,    -1,   198,   211,    -1,   269,
 +      -1,   199,   187,   269,    -1,   269,    -1,   200,   187,   269,
 +      -1,    -1,    -1,     4,   202,   181,   199,   182,   203,   188,
 +     200,   189,     6,    -1,   282,    -1,   204,   187,   282,    -1,
 +      -1,   121,   181,   269,   187,   269,   187,   269,   182,   206,
 +     188,   204,   189,     6,    -1,   282,    -1,   207,   187,   282,
 +      -1,    -1,   122,   181,   269,   187,   269,   187,   269,   187,
 +     269,   182,   209,   188,   207,   189,     6,    -1,   123,   188,
 +     274,   189,   188,   274,   189,     6,    -1,   123,   188,   274,
 +     189,   188,   274,   189,   188,   274,   189,   188,   274,   189,
 +       6,    -1,    -1,   124,   212,   188,   200,   189,     6,    -1,
 +       7,    -1,   161,    -1,   160,    -1,   159,    -1,   158,    -1,
 +     179,    -1,   178,    -1,   181,    -1,   183,    -1,   182,    -1,
 +     184,    -1,    64,   183,   219,   184,     6,    -1,    65,   183,
 +     222,   184,     6,    -1,   287,   213,   275,     6,    -1,     4,
 +     183,   184,   213,   275,     6,    -1,   286,   183,   184,   213,
 +     275,     6,    -1,     4,   183,   269,   184,   213,   269,     6,
 +      -1,     4,   181,   269,   182,   213,   269,     6,    -1,   286,
 +     183,   269,   184,   213,   269,     6,    -1,     4,   215,   188,
 +     278,   189,   216,   213,   275,     6,    -1,   286,   215,   188,
 +     278,   189,   216,   213,   275,     6,    -1,   287,   214,     6,
 +      -1,     4,   183,   269,   184,   214,     6,    -1,   286,   183,
 +     269,   184,   214,     6,    -1,   287,     7,   283,     6,    -1,
 +       4,   185,     4,     7,   283,     6,    -1,     4,   183,   269,
 +     184,   185,     4,     7,   283,     6,    -1,     4,   185,     4,
 +     213,   269,     6,    -1,     4,   183,   269,   184,   185,     4,
 +     213,   269,     6,    -1,     4,   185,     4,   214,     6,    -1,
 +       4,   183,   269,   184,   185,     4,   214,     6,    -1,     4,
 +     185,   131,   185,     4,     7,   279,     6,    -1,     4,   183,
 +     269,   184,   185,   131,   185,     4,     7,   279,     6,    -1,
 +       4,   185,   132,     7,   280,     6,    -1,     4,   183,   269,
 +     184,   185,   132,     7,   280,     6,    -1,     4,   140,     7,
 +     269,     6,    -1,   140,   183,   269,   184,     7,     4,     6,
 +      -1,   140,   183,   269,   184,   185,     4,     7,   269,     6,
 +      -1,   140,   183,   269,   184,   185,     4,     7,   283,     6,
 +      -1,   140,   183,   269,   184,   185,     4,     7,   188,   278,
 +     189,     6,    -1,   140,   183,   269,   184,   185,     4,     6,
 +      -1,    92,   181,     4,   182,   185,     4,     7,   269,     6,
 +      -1,    92,   181,     4,   182,   185,     4,     7,   283,     6,
 +      -1,    -1,   187,    -1,    -1,   219,   218,   287,    -1,   219,
 +     218,   287,     7,   269,    -1,    -1,   219,   218,   287,     7,
 +     188,   269,   220,   224,   189,    -1,   219,   218,   287,     7,
 +     283,    -1,    -1,   219,   218,   287,     7,   188,   283,   221,
 +     226,   189,    -1,    -1,   222,   218,   282,    -1,   269,     7,
 +     283,    -1,   223,   187,   269,     7,   283,    -1,    -1,   224,
 +     225,    -1,   187,     4,   275,    -1,   187,     4,   188,   223,
 +     189,    -1,   187,     4,   283,    -1,    -1,   226,   227,    -1,
 +     187,     4,   269,    -1,   187,     4,   283,    -1,   187,     4,
 +     188,   285,   189,    -1,   269,    -1,   283,    -1,   269,    -1,
 +     283,    -1,   269,    -1,   283,    -1,   269,    -1,   283,    -1,
 +      -1,   134,    72,   188,   269,   189,    -1,    -1,    84,   272,
 +      -1,    68,   181,   269,   182,     7,   272,     6,    -1,    88,
 +      68,   181,   228,   182,   213,   275,     6,    -1,    77,    78,
 +     275,     7,   269,     6,    -1,    71,   181,   269,   182,     7,
 +     275,     6,    -1,    93,    71,   275,     6,    -1,    75,   181,
 +     269,   182,     7,   275,     6,    -1,    69,   181,   269,   182,
 +       7,   275,   233,     6,    -1,    70,   181,   269,   182,     7,
 +     275,   233,     6,    -1,   126,   181,   269,   182,     7,   275,
 +       6,    -1,   127,   181,   269,   182,     7,   275,     6,    -1,
 +     128,   181,   269,   182,     7,   275,   130,   275,   129,   269,
 +       6,    -1,    71,     4,   181,   269,   182,     7,   275,     6,
 +      -1,    89,    71,   181,   269,   182,     7,   275,     6,    -1,
 +      88,    71,   181,   229,   182,   213,   275,     6,    -1,    84,
 +      74,   181,   269,   182,     7,   275,     6,    -1,    85,    74,
 +     181,   269,   182,     7,   275,   232,     6,    -1,    12,    13,
 +       6,    -1,    13,    74,   269,     6,    -1,    79,    74,   181,
 +     269,   182,     7,     5,     5,     5,     6,    -1,    72,   181,
 +     269,   182,     7,   275,     6,    -1,    73,   181,   269,   182,
 +       7,   275,     6,    -1,    74,     4,   181,   269,   182,     7,
 +     275,     6,    -1,    89,    74,   181,   269,   182,     7,   275,
 +       6,    -1,    89,    74,   181,   269,   182,     7,   275,     4,
 +     188,   274,   189,     6,    -1,    88,    74,   181,   230,   182,
 +     213,   275,     6,    -1,    87,    76,   181,   269,   182,     7,
 +     275,     6,    -1,    76,   181,   269,   182,     7,   275,     6,
 +      -1,    89,    76,   181,   269,   182,     7,   275,     6,    -1,
 +      88,    76,   181,   231,   182,   213,   275,     6,    -1,    96,
 +     272,   188,   236,   189,    -1,    95,   188,   272,   187,   272,
 +     187,   269,   189,   188,   236,   189,    -1,    97,   272,   188,
 +     236,   189,    -1,    98,   188,   272,   187,   269,   189,   188,
 +     236,   189,    -1,    98,   188,   272,   187,   272,   189,   188,
 +     236,   189,    -1,     4,   188,   236,   189,    -1,   106,    71,
 +     188,   278,   189,    74,   188,   269,   189,    -1,   103,    71,
 +     181,   269,   182,   188,   278,   189,     6,    -1,   237,    -1,
 +     235,    -1,    -1,   237,   234,    -1,   237,    68,   188,   278,
 +     189,     6,    -1,   237,    71,   188,   278,   189,     6,    -1,
 +     237,    74,   188,   278,   189,     6,    -1,   237,    76,   188,
 +     278,   189,     6,    -1,   100,    84,   181,   269,   182,     7,
 +     275,     6,    -1,   100,    68,   181,   269,   182,     7,   188,
 +     274,   189,     6,    -1,   100,    84,   181,   269,   182,     7,
 +     188,   272,   187,   272,   187,   278,   189,     6,    -1,   100,
 +      84,   181,   269,   182,     7,   188,   272,   187,   272,   187,
 +     272,   187,   278,   189,     6,    -1,   100,    72,   181,   269,
 +     182,     7,   188,   272,   187,   278,   189,     6,    -1,   100,
 +       4,   181,   269,   182,     7,   275,     6,    -1,   100,     4,
 +     181,   269,   182,     7,     5,     6,    -1,   100,     4,   188,
 +     269,   189,     6,    -1,   100,     4,   181,   269,   182,     7,
 +     188,   272,   187,   272,   187,   278,   189,     6,    -1,   104,
 +     188,   237,   189,    -1,   104,   140,   183,   269,   184,     6,
 +      -1,   104,     4,   183,   269,   184,     6,    -1,   104,     4,
 +       6,    -1,   104,     4,     4,     6,    -1,   131,   279,   188,
 +     237,   189,    -1,    94,   131,   279,   188,   237,   189,    -1,
 +     144,     5,     6,    -1,   145,     5,     6,    -1,   144,   188,
 +     237,   189,    -1,    94,   144,   188,   237,   189,    -1,   145,
 +     188,   237,   189,    -1,    94,   145,   188,   237,   189,    -1,
 +       4,   283,     6,    -1,    57,   181,   285,   182,     6,    -1,
 +       4,     4,   183,   269,   184,   282,     6,    -1,     4,     4,
 +       4,   183,   269,   184,     6,    -1,     4,   269,     6,    -1,
 +      92,   181,     4,   182,   185,     4,     6,    -1,   125,     4,
 +       6,    -1,   138,     6,    -1,   139,     6,    -1,    55,     6,
 +      -1,    50,     6,    -1,    50,   188,   269,   187,   269,   187,
 +     269,   187,   269,   187,   269,   187,   269,   189,     6,    -1,
 +      51,     6,    -1,    52,     6,    -1,    61,     6,    -1,    62,
 +       6,    -1,    81,     6,    -1,    82,   188,   278,   189,   188,
 +     278,   189,   188,   274,   189,   188,   269,   187,   269,   189,
 +       6,    -1,   152,   269,     6,    -1,   133,   181,   269,     8,
 +     269,   182,    -1,   133,   181,   269,     8,   269,     8,   269,
 +     182,    -1,   133,     4,   134,   188,   269,     8,   269,   189,
 +      -1,   133,     4,   134,   188,   269,     8,   269,     8,   269,
 +     189,    -1,   135,    -1,   143,     4,    -1,   141,    -1,   142,
 +     287,     6,    -1,   136,   181,   269,   182,    -1,   137,    -1,
 +      99,   272,   188,   237,   189,    -1,    99,   188,   272,   187,
 +     272,   187,   269,   189,   188,   237,   189,    -1,    99,   188,
 +     272,   187,   272,   187,   272,   187,   269,   189,   188,   237,
 +     189,    -1,    -1,    99,   272,   188,   237,   245,   258,   189,
 +      -1,    -1,    99,   188,   272,   187,   272,   187,   269,   189,
 +     188,   237,   246,   258,   189,    -1,    -1,    99,   188,   272,
 +     187,   272,   187,   272,   187,   269,   189,   188,   237,   247,
 +     258,   189,    -1,    -1,    99,   188,   237,   248,   258,   189,
 +      -1,    99,    68,   188,   269,   187,   272,   189,     6,    -1,
 +      99,    71,   188,   269,   187,   272,   189,     6,    -1,    99,
 +      74,   188,   269,   187,   272,   189,     6,    -1,    99,    68,
 +     188,   269,   187,   272,   187,   272,   187,   269,   189,     6,
 +      -1,    99,    71,   188,   269,   187,   272,   187,   272,   187,
 +     269,   189,     6,    -1,    99,    74,   188,   269,   187,   272,
 +     187,   272,   187,   269,   189,     6,    -1,    99,    68,   188,
 +     269,   187,   272,   187,   272,   187,   272,   187,   269,   189,
 +       6,    -1,    99,    71,   188,   269,   187,   272,   187,   272,
 +     187,   272,   187,   269,   189,     6,    -1,    99,    74,   188,
 +     269,   187,   272,   187,   272,   187,   272,   187,   269,   189,
 +       6,    -1,    -1,    99,    68,   188,   269,   187,   272,   189,
 +     249,   188,   258,   189,     6,    -1,    -1,    99,    71,   188,
 +     269,   187,   272,   189,   250,   188,   258,   189,     6,    -1,
 +      -1,    99,    74,   188,   269,   187,   272,   189,   251,   188,
 +     258,   189,     6,    -1,    -1,    99,    68,   188,   269,   187,
 +     272,   187,   272,   187,   269,   189,   252,   188,   258,   189,
 +       6,    -1,    -1,    99,    71,   188,   269,   187,   272,   187,
 +     272,   187,   269,   189,   253,   188,   258,   189,     6,    -1,
 +      -1,    99,    74,   188,   269,   187,   272,   187,   272,   187,
 +     269,   189,   254,   188,   258,   189,     6,    -1,    -1,    99,
 +      68,   188,   269,   187,   272,   187,   272,   187,   272,   187,
 +     269,   189,   255,   188,   258,   189,     6,    -1,    -1,    99,
 +      71,   188,   269,   187,   272,   187,   272,   187,   272,   187,
 +     269,   189,   256,   188,   258,   189,     6,    -1,    -1,    99,
 +      74,   188,   269,   187,   272,   187,   272,   187,   272,   187,
 +     269,   189,   257,   188,   258,   189,     6,    -1,   259,    -1,
 +     258,   259,    -1,   109,   188,   269,   189,     6,    -1,   109,
 +     188,   275,   187,   275,   189,     6,    -1,   109,   188,   275,
 +     187,   275,   187,   275,   189,     6,    -1,   110,     6,    -1,
 +     101,     6,    -1,   117,     6,    -1,   117,   119,     6,    -1,
 +     118,     6,    -1,   118,   119,     6,    -1,   115,     6,    -1,
 +     115,   119,     6,    -1,   116,     6,    -1,   116,   119,     6,
 +      -1,   111,   181,   269,   182,     7,   275,    91,   269,     6,
 +      -1,    91,     4,   183,   269,   184,     6,    -1,    -1,    91,
 +       4,   269,    -1,    -1,     4,    -1,    -1,     7,   275,    -1,
 +      -1,     7,   269,    -1,    -1,    91,   275,    -1,    86,    71,
 +     276,     7,   269,   260,     6,    -1,    86,    74,   276,   262,
 +     261,     6,    -1,    80,    74,   188,   269,   189,     7,   275,
 +       6,    -1,    86,    76,   276,   262,     6,    -1,   120,   276,
 +       6,    -1,   107,    74,   188,   278,   189,   269,     6,    -1,
 +     101,    74,   276,   263,     6,    -1,   101,    76,   276,     6,
 +      -1,   102,    74,   275,     7,   269,     6,    -1,    90,    71,
 +     275,     7,   275,     6,    -1,    90,    74,   269,   188,   278,
 +     189,     7,   269,   188,   278,   189,   264,     6,    -1,    68,
 +     188,   278,   189,   134,    74,   188,   269,   189,     6,    -1,
 +      71,   188,   278,   189,   134,    74,   188,   269,   189,     6,
 +      -1,    68,   188,   278,   189,   134,    76,   188,   269,   189,
 +       6,    -1,    71,   188,   278,   189,   134,    76,   188,   269,
 +     189,     6,    -1,    74,   188,   278,   189,   134,    76,   188,
 +     269,   189,     6,    -1,   108,    74,   276,     6,    -1,   108,
 +      71,   276,     6,    -1,    83,    68,   276,     6,    -1,    83,
 +      71,   276,     6,    -1,    83,    74,   276,     6,    -1,   105,
 +       6,    -1,   105,     4,     6,    -1,   105,    68,   188,   278,
 +     189,     6,    -1,   149,    -1,   150,    -1,   151,    -1,   267,
 +       6,    -1,   267,   188,   275,   189,     6,    -1,   267,   188,
 +     275,   187,   275,   189,     6,    -1,   267,   181,   275,   182,
 +     188,   275,   187,   275,   189,     6,    -1,   270,    -1,   181,
 +     269,   182,    -1,   172,   269,    -1,   171,   269,    -1,   176,
 +     269,    -1,   269,   172,   269,    -1,   269,   171,   269,    -1,
 +     269,   173,   269,    -1,   269,   174,   269,    -1,   269,   175,
 +     269,    -1,   269,   180,   269,    -1,   269,   167,   269,    -1,
 +     269,   168,   269,    -1,   269,   170,   269,    -1,   269,   169,
 +     269,    -1,   269,   166,   269,    -1,   269,   165,   269,    -1,
 +     269,   164,   269,    -1,   269,   163,   269,    -1,   269,   162,
 +     269,     8,   269,    -1,    14,   215,   269,   216,    -1,    15,
 +     215,   269,   216,    -1,    16,   215,   269,   216,    -1,    17,
 +     215,   269,   216,    -1,    18,   215,   269,   216,    -1,    19,
 +     215,   269,   216,    -1,    20,   215,   269,   216,    -1,    21,
 +     215,   269,   216,    -1,    22,   215,   269,   216,    -1,    24,
 +     215,   269,   216,    -1,    25,   215,   269,   187,   269,   216,
 +      -1,    26,   215,   269,   216,    -1,    27,   215,   269,   216,
 +      -1,    28,   215,   269,   216,    -1,    29,   215,   269,   216,
 +      -1,    30,   215,   269,   216,    -1,    31,   215,   269,   216,
 +      -1,    32,   215,   269,   216,    -1,    33,   215,   269,   187,
 +     269,   216,    -1,    34,   215,   269,   187,   269,   216,    -1,
 +      35,   215,   269,   187,   269,   216,    -1,    23,   215,   269,
 +     216,    -1,     3,    -1,     9,    -1,    10,    -1,    11,    -1,
 +     155,    -1,   156,    -1,   157,    -1,    58,    -1,    59,    -1,
 +      60,    -1,    -1,    66,   215,   269,   271,   224,   216,    -1,
 +     287,    -1,     4,   183,   269,   184,    -1,   286,   183,   269,
 +     184,    -1,   153,   181,   287,   182,    -1,   154,   181,   283,
 +     182,    -1,   186,   287,   183,   184,    -1,   287,   214,    -1,
 +       4,   183,   269,   184,   214,    -1,   286,   183,   269,   184,
 +     214,    -1,     4,   185,     4,    -1,     4,   183,   269,   184,
 +     185,     4,    -1,     4,   185,     4,   214,    -1,     4,   183,
 +     269,   184,   185,     4,   214,    -1,   146,   181,   282,   187,
 +     269,   182,    -1,    45,   181,   275,   187,   275,   182,    -1,
 +      46,   181,   282,   187,   282,   182,    -1,    47,   181,   282,
 +     187,   282,   182,    -1,    49,   181,   285,   182,    -1,   273,
 +      -1,   172,   272,    -1,   171,   272,    -1,   272,   172,   272,
 +      -1,   272,   171,   272,    -1,   188,   269,   187,   269,   187,
 +     269,   187,   269,   187,   269,   189,    -1,   188,   269,   187,
 +     269,   187,   269,   187,   269,   189,    -1,   188,   269,   187,
 +     269,   187,   269,   189,    -1,   181,   269,   187,   269,   187,
 +     269,   182,    -1,   275,    -1,   274,   187,   275,    -1,   269,
 +      -1,   277,    -1,   188,   189,    -1,   188,   278,   189,    -1,
 +     172,   188,   278,   189,    -1,   269,   173,   188,   278,   189,
 +      -1,   275,    -1,     5,    -1,   172,   277,    -1,   269,   173,
 +     277,    -1,   269,     8,   269,    -1,   269,     8,   269,     8,
 +     269,    -1,    68,   188,   269,   189,    -1,    68,     5,    -1,
 +      71,     5,    -1,    74,     5,    -1,    76,     5,    -1,    88,
 +      68,     5,    -1,    88,    71,     5,    -1,    88,    74,     5,
 +      -1,    88,    76,     5,    -1,    88,    68,   188,   278,   189,
 +      -1,    88,    71,   188,   278,   189,    -1,    88,    74,   188,
 +     278,   189,    -1,    88,    76,   188,   278,   189,    -1,    68,
 +     134,    50,   188,   269,   187,   269,   187,   269,   187,   269,
 +     187,   269,   187,   269,   189,    -1,    71,   134,    50,   188,
 +     269,   187,   269,   187,   269,   187,   269,   187,   269,   187,
 +     269,   189,    -1,    74,   134,    50,   188,   269,   187,   269,
 +     187,   269,   187,   269,   187,   269,   187,   269,   189,    -1,
 +      76,   134,    50,   188,   269,   187,   269,   187,   269,   187,
 +     269,   187,   269,   187,   269,   189,    -1,   235,    -1,   244,
 +      -1,     4,   215,   216,    -1,   286,   215,   216,    -1,    36,
 +     183,   287,   184,    -1,     4,   215,   188,   278,   189,   216,
 +      -1,   286,   215,   188,   278,   189,   216,    -1,   269,    -1,
 +     277,    -1,   278,   187,   269,    -1,   278,   187,   277,    -1,
 +     188,   269,   187,   269,   187,   269,   187,   269,   189,    -1,
 +     188,   269,   187,   269,   187,   269,   189,    -1,     4,    -1,
 +       4,   185,   131,   185,     4,    -1,   188,   281,   189,    -1,
 +       4,   183,   269,   184,   185,   132,    -1,   279,    -1,   281,
 +     187,   279,    -1,   283,    -1,   287,    -1,     4,   185,     4,
 +      -1,     4,   183,   269,   184,   185,     4,    -1,     5,    -1,
 +      53,    -1,    56,    -1,   147,   181,   282,   182,    -1,   148,
 +     181,   282,   187,   282,   182,    -1,    41,   215,   285,   216,
 +      -1,    42,   181,   282,   182,    -1,    43,   181,   282,   182,
 +      -1,    44,   181,   282,   187,   282,   187,   282,   182,    -1,
 +      39,   215,   285,   216,    -1,    48,   215,   269,   187,   283,
 +     187,   283,   216,    -1,    40,   215,   282,   216,    -1,    40,
 +     215,   282,   187,   278,   216,    -1,    54,   215,   282,   216,
 +      -1,    -1,    67,   215,   283,   284,   226,   216,    -1,   282,
 +      -1,   285,   187,   282,    -1,     4,   190,   188,   269,   189,
 +      -1,   286,   190,   188,   269,   189,    -1,     4,    -1,   286,
 +      -1
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 +static const yytype_uint16 yyrline[] =
 +{
 +<<<<<<< HEAD
 +       0,   182,   182,   183,   188,   190,   194,   195,   196,   197,
 +     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
 +     208,   212,   216,   223,   228,   233,   247,   260,   273,   301,
 +     315,   328,   341,   360,   365,   366,   367,   368,   369,   373,
 +     375,   380,   382,   388,   492,   387,   510,   517,   528,   527,
 +     545,   552,   563,   562,   579,   596,   619,   618,   632,   633,
 +     634,   635,   636,   640,   641,   647,   647,   648,   648,   654,
 +     655,   656,   717,   746,   751,   756,   761,   768,   775,   790,
 +     795,   800,   809,   815,   824,   842,   860,   869,   881,   886,
 +     894,   914,   937,   948,   956,   978,  1001,  1027,  1048,  1060,
 +    1074,  1074,  1076,  1078,  1087,  1097,  1096,  1108,  1118,  1117,
 +    1131,  1133,  1141,  1147,  1154,  1155,  1159,  1170,  1185,  1195,
 +    1196,  1201,  1209,  1218,  1236,  1240,  1251,  1254,  1267,  1270,
 +    1280,  1304,  1303,  1323,  1345,  1363,  1384,  1402,  1432,  1462,
 +    1480,  1498,  1525,  1543,  1562,  1561,  1584,  1602,  1641,  1647,
 +    1653,  1660,  1685,  1710,  1727,  1746,  1781,  1780,  1804,  1822,
 +    1839,  1856,  1855,  1881,  1886,  1891,  1896,  1901,  1906,  1929,
 +    1935,  1946,  1947,  1952,  1955,  1959,  1982,  2005,  2028,  2056,
 +    2077,  2103,  2124,  2146,  2166,  2278,  2297,  2335,  2444,  2453,
 +    2459,  2474,  2502,  2519,  2528,  2542,  2548,  2554,  2563,  2572,
 +    2581,  2595,  2648,  2665,  2680,  2699,  2711,  2735,  2739,  2744,
 +    2751,  2757,  2762,  2768,  2776,  2780,  2784,  2789,  2844,  2857,
 +    2874,  2891,  2912,  2933,  2968,  2976,  2982,  2989,  2993,  3002,
 +    3010,  3018,  3027,  3026,  3041,  3040,  3055,  3054,  3069,  3068,
 +    3082,  3089,  3096,  3103,  3110,  3117,  3124,  3131,  3138,  3146,
 +    3145,  3159,  3158,  3172,  3171,  3185,  3184,  3198,  3197,  3211,
 +    3210,  3224,  3223,  3237,  3236,  3250,  3249,  3266,  3269,  3275,
 +    3287,  3307,  3331,  3335,  3339,  3343,  3347,  3353,  3359,  3363,
 +    3367,  3371,  3375,  3394,  3407,  3410,  3426,  3429,  3446,  3449,
 +    3455,  3458,  3465,  3521,  3591,  3596,  3663,  3699,  3707,  3750,
 +    3789,  3809,  3836,  3876,  3899,  3922,  3926,  3930,  3953,  3992,
 +    4031,  4052,  4073,  4100,  4104,  4114,  4149,  4150,  4151,  4155,
 +    4161,  4173,  4191,  4219,  4220,  4221,  4222,  4223,  4224,  4225,
 +    4226,  4227,  4234,  4235,  4236,  4237,  4238,  4239,  4240,  4241,
 +    4242,  4243,  4244,  4245,  4246,  4247,  4248,  4249,  4250,  4251,
 +    4252,  4253,  4254,  4255,  4256,  4257,  4258,  4259,  4260,  4261,
 +    4262,  4263,  4264,  4265,  4266,  4275,  4276,  4277,  4278,  4279,
 +    4280,  4281,  4282,  4283,  4284,  4289,  4288,  4296,  4313,  4331,
 +    4349,  4354,  4360,  4372,  4389,  4407,  4428,  4433,  4438,  4448,
 +    4458,  4463,  4472,  4477,  4504,  4508,  4512,  4516,  4520,  4527,
 +    4531,  4535,  4539,  4546,  4551,  4558,  4563,  4567,  4572,  4576,
 +    4584,  4595,  4599,  4611,  4619,  4627,  4634,  4644,  4664,  4668,
 +    4672,  4676,  4680,  4709,  4738,  4767,  4796,  4806,  4816,  4828,
 +    4840,  4861,  4866,  4870,  4874,  4886,  4890,  4902,  4909,  4919,
 +    4923,  4938,  4943,  4950,  4954,  4967,  4975,  4986,  4990,  4998,
 +    5004,  5012,  5020,  5028,  5042,  5056,  5068,  5084,  5088,  5108,
 +    5107,  5120,  5125,  5131,  5140,  5153,  5156
 +=======
 +       0,   183,   183,   184,   189,   191,   195,   196,   197,   198,
 +     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
 +     209,   213,   217,   224,   229,   234,   248,   261,   274,   302,
 +     316,   329,   342,   361,   366,   367,   368,   369,   370,   374,
 +     376,   381,   383,   389,   493,   388,   511,   518,   529,   528,
 +     546,   553,   564,   563,   580,   597,   620,   619,   633,   634,
 +     635,   636,   637,   641,   642,   648,   648,   649,   649,   655,
 +     656,   657,   718,   747,   776,   781,   786,   791,   798,   805,
 +     820,   825,   830,   839,   845,   854,   872,   890,   899,   911,
 +     916,   924,   944,   967,   978,   986,  1008,  1031,  1057,  1078,
 +    1090,  1104,  1104,  1106,  1108,  1117,  1127,  1126,  1138,  1148,
 +    1147,  1161,  1163,  1171,  1177,  1184,  1185,  1189,  1200,  1215,
 +    1225,  1226,  1231,  1239,  1248,  1266,  1270,  1279,  1283,  1292,
 +    1296,  1305,  1309,  1319,  1322,  1335,  1338,  1348,  1371,  1403,
 +    1426,  1444,  1465,  1483,  1513,  1543,  1561,  1579,  1606,  1624,
 +    1642,  1677,  1695,  1734,  1740,  1746,  1753,  1778,  1803,  1820,
 +    1839,  1873,  1909,  1927,  1944,  1960,  1997,  2002,  2007,  2012,
 +    2017,  2022,  2045,  2051,  2062,  2063,  2068,  2071,  2075,  2098,
 +    2121,  2144,  2172,  2193,  2219,  2240,  2262,  2282,  2394,  2413,
 +    2451,  2560,  2569,  2575,  2590,  2618,  2635,  2644,  2658,  2664,
 +    2670,  2679,  2688,  2697,  2711,  2767,  2785,  2802,  2817,  2836,
 +    2848,  2872,  2876,  2881,  2888,  2894,  2899,  2905,  2913,  2917,
 +    2921,  2926,  2981,  2994,  3011,  3028,  3049,  3070,  3105,  3113,
 +    3119,  3126,  3130,  3139,  3147,  3155,  3164,  3163,  3178,  3177,
 +    3192,  3191,  3206,  3205,  3219,  3226,  3233,  3240,  3247,  3254,
 +    3261,  3268,  3275,  3283,  3282,  3296,  3295,  3309,  3308,  3322,
 +    3321,  3335,  3334,  3348,  3347,  3361,  3360,  3374,  3373,  3387,
 +    3386,  3403,  3406,  3412,  3424,  3444,  3468,  3472,  3476,  3480,
 +    3484,  3490,  3496,  3500,  3504,  3508,  3512,  3531,  3544,  3547,
 +    3563,  3566,  3583,  3586,  3592,  3595,  3602,  3605,  3612,  3668,
 +    3738,  3743,  3810,  3846,  3854,  3897,  3936,  3956,  3983,  4032,
 +    4060,  4088,  4092,  4096,  4124,  4163,  4202,  4223,  4244,  4271,
 +    4275,  4285,  4320,  4321,  4322,  4326,  4332,  4344,  4362,  4390,
 +    4391,  4392,  4393,  4394,  4395,  4396,  4397,  4398,  4405,  4406,
 +    4407,  4408,  4409,  4410,  4411,  4412,  4413,  4414,  4415,  4416,
 +    4417,  4418,  4419,  4420,  4421,  4422,  4423,  4424,  4425,  4426,
 +    4427,  4428,  4429,  4430,  4431,  4432,  4433,  4434,  4435,  4436,
 +    4437,  4446,  4447,  4448,  4449,  4450,  4451,  4452,  4453,  4454,
 +    4455,  4460,  4459,  4467,  4484,  4502,  4520,  4525,  4531,  4543,
 +    4560,  4578,  4599,  4604,  4609,  4619,  4629,  4634,  4645,  4654,
 +    4659,  4686,  4690,  4694,  4698,  4702,  4709,  4713,  4717,  4721,
 +    4728,  4733,  4740,  4745,  4749,  4754,  4758,  4766,  4777,  4781,
 +    4793,  4801,  4809,  4816,  4826,  4855,  4859,  4863,  4867,  4871,
 +    4875,  4879,  4883,  4887,  4916,  4945,  4974,  5003,  5016,  5029,
 +    5042,  5055,  5065,  5075,  5087,  5099,  5111,  5129,  5150,  5155,
 +    5159,  5163,  5175,  5179,  5191,  5198,  5208,  5212,  5227,  5232,
 +    5239,  5243,  5256,  5264,  5275,  5279,  5287,  5293,  5301,  5309,
 +    5324,  5338,  5352,  5364,  5380,  5391,  5395,  5414,  5422,  5421,
 +    5434,  5439,  5445,  5454,  5467,  5470
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+      165,   166,   167,   168,   169,   171,   172,   173,   174,   176,
+      178,   185,   186,   187
+ };
+ 
+ #if YYDEBUG
+   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+ static const yytype_uint16 yyrline[] =
+ {
+        0,   191,   191,   192,   197,   199,   203,   204,   205,   206,
+      207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+      217,   218,   222,   226,   233,   238,   243,   257,   270,   283,
+      311,   325,   338,   351,   370,   375,   376,   377,   378,   379,
+      383,   385,   390,   392,   398,   502,   397,   520,   527,   538,
+      537,   555,   562,   573,   572,   589,   606,   629,   628,   642,
+      643,   644,   645,   646,   650,   651,   657,   657,   658,   658,
+      664,   665,   666,   671,   677,   737,   766,   795,   800,   805,
+      810,   815,   822,   829,   844,   849,   854,   859,   864,   873,
+      879,   888,   906,   924,   933,   945,   950,   958,   978,  1001,
+     1012,  1020,  1042,  1065,  1091,  1112,  1124,  1138,  1138,  1140,
+     1142,  1151,  1161,  1160,  1178,  1188,  1187,  1201,  1203,  1211,
+     1217,  1224,  1225,  1229,  1240,  1255,  1265,  1266,  1271,  1279,
+     1288,  1296,  1314,  1318,  1324,  1332,  1336,  1342,  1350,  1354,
+     1360,  1368,  1372,  1378,  1387,  1390,  1403,  1406,  1416,  1439,
+     1471,  1494,  1512,  1533,  1551,  1581,  1611,  1629,  1647,  1674,
+     1692,  1710,  1745,  1763,  1802,  1808,  1814,  1821,  1846,  1871,
+     1888,  1907,  1941,  1977,  1995,  2012,  2028,  2065,  2070,  2075,
+     2080,  2085,  2090,  2113,  2119,  2130,  2131,  2136,  2139,  2143,
+     2166,  2189,  2212,  2240,  2261,  2287,  2308,  2330,  2350,  2462,
+     2481,  2519,  2628,  2637,  2643,  2658,  2686,  2703,  2712,  2726,
+     2740,  2746,  2752,  2761,  2770,  2779,  2793,  2849,  2867,  2884,
+     2899,  2918,  2930,  2954,  2958,  2963,  2970,  2975,  2981,  2986,
+     2992,  3000,  3004,  3008,  3013,  3068,  3081,  3098,  3115,  3137,
+     3159,  3194,  3202,  3208,  3215,  3219,  3228,  3236,  3244,  3253,
+     3252,  3267,  3266,  3281,  3280,  3295,  3294,  3308,  3315,  3322,
+     3329,  3336,  3343,  3350,  3357,  3364,  3372,  3371,  3385,  3384,
+     3398,  3397,  3411,  3410,  3424,  3423,  3437,  3436,  3450,  3449,
+     3463,  3462,  3476,  3475,  3492,  3495,  3501,  3513,  3533,  3557,
+     3561,  3565,  3569,  3573,  3579,  3585,  3589,  3593,  3597,  3601,
+     3620,  3633,  3636,  3652,  3655,  3672,  3675,  3681,  3684,  3691,
+     3694,  3701,  3757,  3827,  3832,  3899,  3935,  3943,  3986,  4025,
+     4045,  4077,  4104,  4130,  4156,  4182,  4208,  4230,  4258,  4286,
+     4290,  4294,  4322,  4361,  4400,  4421,  4442,  4469,  4473,  4483,
+     4518,  4519,  4520,  4524,  4530,  4542,  4560,  4588,  4589,  4590,
+     4591,  4592,  4593,  4594,  4595,  4596,  4603,  4604,  4605,  4606,
+     4607,  4608,  4609,  4610,  4611,  4612,  4613,  4614,  4615,  4616,
+     4617,  4618,  4619,  4620,  4621,  4622,  4623,  4624,  4625,  4626,
+     4627,  4628,  4629,  4630,  4631,  4632,  4633,  4634,  4635,  4644,
+     4645,  4646,  4647,  4648,  4649,  4650,  4651,  4652,  4653,  4658,
+     4657,  4665,  4670,  4687,  4705,  4723,  4741,  4759,  4764,  4770,
+     4782,  4799,  4817,  4835,  4853,  4874,  4879,  4884,  4894,  4904,
+     4909,  4920,  4929,  4934,  4961,  4965,  4969,  4973,  4977,  4984,
+     4988,  4992,  4996,  5003,  5008,  5015,  5020,  5024,  5029,  5033,
+     5041,  5052,  5056,  5068,  5076,  5084,  5091,  5101,  5130,  5134,
+     5138,  5142,  5146,  5150,  5154,  5158,  5162,  5191,  5220,  5249,
+     5278,  5291,  5304,  5317,  5330,  5340,  5350,  5362,  5375,  5387,
+     5405,  5426,  5431,  5435,  5439,  5451,  5455,  5467,  5474,  5484,
+     5488,  5503,  5508,  5515,  5519,  5532,  5540,  5551,  5555,  5563,
+     5569,  5575,  5583,  5591,  5598,  5613,  5627,  5641,  5653,  5669,
+     5680,  5684,  5703,  5710,  5717,  5716,  5729,  5734,  5740,  5749,
+     5762,  5765
++>>>>>>> upstream/2.10.1+dfsg1
  };
  #endif
  
@@@ -1880,25 -801,20 +1988,37 @@@ static const char *const yytname[] 
    "tCos", "tAcos", "tTan", "tRand", "tAtan", "tAtan2", "tSinh", "tCosh",
    "tTanh", "tFabs", "tFloor", "tCeil", "tRound", "tFmod", "tModulo",
    "tHypot", "tList", "tPrintf", "tError", "tStr", "tSprintf", "tStrCat",
 +<<<<<<< HEAD
 +  "tStrPrefix", "tStrRelative", "tStrReplace", "tStrFind", "tStrCmp",
 +  "tTextAttributes", "tBoundingBox", "tDraw", "tSetChanged", "tToday",
 +  "tOnelabAction", "tSyncModel", "tCpu", "tMemory", "tTotalMemory",
 +=======
    "tStrPrefix", "tStrRelative", "tStrReplace", "tFind", "tStrFind",
    "tStrCmp", "tStrChoice", "tTextAttributes", "tBoundingBox", "tDraw",
++<<<<<<< HEAD
 +  "tSetChanged", "tToday", "tFixRelativePath", "tSyncModel",
 +  "tOnelabAction", "tOnelabRun", "tCpu", "tMemory", "tTotalMemory",
 +>>>>>>> upstream/2.9.3+dfsg1
 +  "tCreateTopology", "tCreateTopologyNoHoles", "tDistanceFunction",
 +  "tDefineConstant", "tUndefineConstant", "tDefineNumber", "tDefineString",
 +  "tPoint", "tCircle", "tEllipse", "tLine", "tSphere", "tPolarSphere",
 +  "tSurface", "tSpline", "tVolume", "tCharacteristic", "tLength",
 +  "tParametric", "tElliptic", "tRefineMesh", "tAdaptMesh", "tRelocateMesh",
 +  "tPlane", "tRuled", "tTransfinite", "tComplex", "tPhysical", "tCompound",
++=======
+   "tSetChanged", "tToday", "tFixRelativePath", "tCurrentDirectory",
+   "tSyncModel", "tNewModel", "tOnelabAction", "tOnelabRun", "tCpu",
+   "tMemory", "tTotalMemory", "tCreateTopology", "tCreateTopologyNoHoles",
+   "tDistanceFunction", "tDefineConstant", "tUndefineConstant",
+   "tDefineNumber", "tDefineString", "tSetNumber", "tSetString", "tPoint",
+   "tCircle", "tEllipse", "tLine", "tSphere", "tPolarSphere", "tSurface",
+   "tSpline", "tVolume", "tCharacteristic", "tLength", "tParametric",
+   "tElliptic", "tRefineMesh", "tAdaptMesh", "tRelocateMesh", "tPlane",
+   "tRuled", "tTransfinite", "tComplex", "tPhysical", "tCompound",
++>>>>>>> upstream/2.10.1+dfsg1
    "tPeriodic", "tUsing", "tPlugin", "tDegenerated", "tRecursive",
    "tRotate", "tTranslate", "tSymmetry", "tDilate", "tExtrude", "tLevelset",
-   "tRecombine", "tSmoother", "tSplit", "tDelete", "tCoherence",
+   "tAffine", "tRecombine", "tSmoother", "tSplit", "tDelete", "tCoherence",
    "tIntersect", "tMeshAlgorithm", "tReverse", "tLayers", "tScaleLast",
    "tHole", "tAlias", "tAliasWithOptions", "tCopyOptions",
    "tQuadTriAddVerts", "tQuadTriNoNewVerts", "tQuadTriSngl", "tQuadTriDbl",
@@@ -1906,56 -822,35 +2026,85 @@@
    "tInterpolationScheme", "tTime", "tCombine", "tBSpline", "tBezier",
    "tNurbs", "tNurbsOrder", "tNurbsKnots", "tColor", "tColorTable", "tFor",
    "tIn", "tEndFor", "tIf", "tEndIf", "tExit", "tAbort", "tField",
-   "tReturn", "tCall", "tFunction", "tShow", "tHide", "tGetValue",
-   "tGetEnv", "tGetString", "tHomology", "tCohomology", "tBetti",
+   "tReturn", "tCall", "tMacro", "tShow", "tHide", "tGetValue", "tGetEnv",
+   "tGetString", "tGetNumber", "tHomology", "tCohomology", "tBetti",
    "tSetOrder", "tExists", "tFileExists", "tGMSH_MAJOR_VERSION",
++<<<<<<< HEAD
 +  "tGMSH_MINOR_VERSION", "tGMSH_PATCH_VERSION", "tAFFECTDIVIDE",
 +  "tAFFECTTIMES", "tAFFECTMINUS", "tAFFECTPLUS", "'?'", "tOR", "tAND",
 +  "tNOTEQUAL", "tEQUAL", "'<'", "'>'", "tGREATEROREQUAL", "tLESSOREQUAL",
 +  "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARYPREC", "tMINUSMINUS",
 +  "tPLUSPLUS", "'^'", "'('", "')'", "'['", "']'", "'.'", "'#'", "','",
 +  "'{'", "'}'", "'~'", "$accept", "All", "GeoFormatItems", "GeoFormatItem",
 +  "SendToFile", "Printf", "View", "Views", "ElementCoords",
 +<<<<<<< HEAD
 +  "ElementValues", "Element", "@1", "@2", "Text2DValues", "Text2D", "@3",
 +  "Text3DValues", "Text3D", "@4", "InterpolationMatrix", "Time", "@5",
 +  "NumericAffectation", "NumericIncrement", "LP", "RP", "Affectation",
 +  "Comma", "DefineConstants", "@6", "@7", "UndefineConstants",
 +  "Enumeration", "FloatParameterOptions", "FloatParameterOption",
 +  "CharParameterOptions", "CharParameterOption", "PhysicalId",
 +  "InSphereCenter", "CircleOptions", "Shape", "@8", "@9", "@10", "@11",
 +  "Transform", "MultipleShape", "ListOfShapes", "LevelSet", "Delete",
 +  "Colorify", "Visibility", "Command", "Loop", "Extrude", "@12", "@13",
 +  "@14", "@15", "@16", "@17", "@18", "@19", "@20", "@21", "@22", "@23",
 +  "@24", "ExtrudeParameters", "ExtrudeParameter", "TransfiniteType",
 +  "TransfiniteArrangement", "TransfiniteCorners", "RecombineAngle",
 +  "Constraints", "Coherence", "HomologyCommand", "Homology", "FExpr",
 +  "FExpr_Single", "@25", "VExpr", "VExpr_Single",
 +  "RecursiveListOfListOfDouble", "ListOfDouble", "ListOfDoubleOrAll",
 +  "FExpr_Multi", "RecursiveListOfDouble", "ColorExpr", "ListOfColor",
 +  "RecursiveListOfColor", "StringExprVar", "StringExpr", "@26",
 +  "RecursiveListOfStringExprVar", "StringIndex", "String__Index", 0
 +=======
 +  "ElementValues", "Element", "$@1", "$@2", "Text2DValues", "Text2D",
 +  "$@3", "Text3DValues", "Text3D", "$@4", "InterpolationMatrix", "Time",
 +  "$@5", "NumericAffectation", "NumericIncrement", "LP", "RP",
 +  "Affectation", "Comma", "DefineConstants", "$@6", "$@7",
 +  "UndefineConstants", "Enumeration", "FloatParameterOptions",
 +  "FloatParameterOption", "CharParameterOptions", "CharParameterOption",
 +  "PhysicalId0", "PhysicalId1", "PhysicalId2", "PhysicalId3",
 +  "InSphereCenter", "CircleOptions", "Shape", "Transform", "MultipleShape",
 +  "ListOfShapes", "LevelSet", "Delete", "Colorify", "Visibility",
 +  "Command", "Loop", "Extrude", "$@8", "$@9", "$@10", "$@11", "$@12",
 +  "$@13", "$@14", "$@15", "$@16", "$@17", "$@18", "$@19", "$@20",
 +  "ExtrudeParameters", "ExtrudeParameter", "TransfiniteType",
 +  "TransfiniteArrangement", "TransfiniteCorners", "RecombineAngle",
 +  "PeriodicTransform", "Constraints", "Coherence", "HomologyCommand",
 +  "Homology", "FExpr", "FExpr_Single", "$@21", "VExpr", "VExpr_Single",
 +  "RecursiveListOfListOfDouble", "ListOfDouble", "ListOfDoubleOrAll",
 +  "FExpr_Multi", "RecursiveListOfDouble", "ColorExpr", "ListOfColor",
 +  "RecursiveListOfColor", "StringExprVar", "StringExpr", "$@22",
 +  "RecursiveListOfStringExprVar", "StringIndex", "String__Index", YY_NULL
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   "tGMSH_MINOR_VERSION", "tGMSH_PATCH_VERSION", "tGmshExecutableName",
+   "tSetPartition", "tAFFECTPLUS", "tAFFECTMINUS", "tAFFECTTIMES",
+   "tAFFECTDIVIDE", "'?'", "tOR", "tAND", "tEQUAL", "tNOTEQUAL", "'<'",
+   "tLESSOREQUAL", "'>'", "tGREATEROREQUAL", "'+'", "'-'", "'*'", "'/'",
+   "'%'", "'!'", "tPLUSPLUS", "tMINUSMINUS", "UNARYPREC", "'^'", "'('",
+   "')'", "'['", "']'", "'.'", "'#'", "','", "'{'", "'}'", "'~'", "$accept",
+   "All", "GeoFormatItems", "GeoFormatItem", "SendToFile", "Printf", "View",
+   "Views", "ElementCoords", "ElementValues", "Element", "$@1", "$@2",
+   "Text2DValues", "Text2D", "$@3", "Text3DValues", "Text3D", "$@4",
+   "InterpolationMatrix", "Time", "$@5", "NumericAffectation",
+   "NumericIncrement", "LP", "RP", "Affectation", "Comma",
+   "DefineConstants", "$@6", "$@7", "UndefineConstants", "Enumeration",
+   "FloatParameterOptions", "FloatParameterOption", "CharParameterOptions",
+   "CharParameterOption", "PhysicalId0", "PhysicalId1", "PhysicalId2",
+   "PhysicalId3", "InSphereCenter", "CircleOptions", "Shape", "Transform",
+   "MultipleShape", "ListOfShapes", "LevelSet", "Delete", "Colorify",
+   "SetPartition", "Visibility", "Command", "Loop", "Extrude", "$@8", "$@9",
+   "$@10", "$@11", "$@12", "$@13", "$@14", "$@15", "$@16", "$@17", "$@18",
+   "$@19", "$@20", "ExtrudeParameters", "ExtrudeParameter",
+   "TransfiniteType", "TransfiniteArrangement", "TransfiniteCorners",
+   "RecombineAngle", "PeriodicTransform", "Constraints", "Coherence",
+   "HomologyCommand", "Homology", "FExpr", "FExpr_Single", "$@21", "VExpr",
+   "VExpr_Single", "RecursiveListOfListOfDouble", "ListOfDouble",
+   "ListOfDoubleOrAll", "FExpr_Multi", "RecursiveListOfDouble", "ColorExpr",
+   "ListOfColor", "RecursiveListOfColor", "StringExprVar", "StringExpr",
+   "$@22", "RecursiveListOfStringExprVar", "StringIndex", "String__Index", YY_NULLPTR
++>>>>>>> upstream/2.10.1+dfsg1
  };
  #endif
  
@@@ -1979,4106 -874,1840 +2128,4985 @@@ static const yytype_uint16 yytoknum[] 
       375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
       385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
       395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
 +<<<<<<< HEAD
 +     405,   406,   407,   408,   409,   410,   411,   412,    63,   413,
 +     414,   415,   416,    60,    62,   417,   418,    43,    45,    42,
 +      47,    37,    33,   419,   420,   421,    94,    40,    41,    91,
 +      93,    46,    35,    44,   123,   125,   126
 +=======
       405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
++<<<<<<< HEAD
 +     415,   416,    63,   417,   418,   419,   420,    60,    62,   421,
 +     422,    43,    45,    42,    47,    37,    33,   423,   424,   425,
 +      94,    40,    41,    91,    93,    46,    35,    44,   123,   125,
 +     126
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +# endif
 +
 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 +static const yytype_uint16 yyr1[] =
 +{
 +<<<<<<< HEAD
 +       0,   187,   188,   188,   189,   189,   190,   190,   190,   190,
 +     190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
 +     190,   191,   191,   192,   192,   192,   192,   192,   192,   193,
 +     193,   193,   193,   194,   194,   194,   194,   194,   194,   195,
 +     195,   196,   196,   198,   199,   197,   200,   200,   202,   201,
 +     203,   203,   205,   204,   206,   206,   208,   207,   209,   209,
 +     209,   209,   209,   210,   210,   211,   211,   212,   212,   213,
 +     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
 +     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
 +     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
 +     214,   214,   215,   215,   215,   216,   215,   215,   217,   215,
 +     218,   218,   219,   219,   220,   220,   221,   221,   221,   222,
 +     222,   223,   223,   223,   224,   224,   225,   225,   226,   226,
 +     227,   228,   227,   227,   227,   227,   227,   227,   227,   227,
 +     227,   227,   227,   227,   229,   227,   227,   227,   227,   227,
 +     227,   227,   227,   227,   227,   227,   230,   227,   227,   227,
 +     227,   231,   227,   232,   232,   232,   232,   232,   232,   232,
 +     232,   233,   233,   234,   234,   234,   234,   234,   234,   235,
 +     235,   235,   235,   235,   235,   235,   235,   235,   236,   236,
 +     236,   236,   236,   237,   237,   238,   238,   238,   238,   238,
 +     238,   239,   239,   239,   239,   239,   239,   239,   239,   239,
 +     239,   239,   239,   239,   239,   239,   239,   239,   239,   240,
 +     240,   240,   240,   240,   240,   240,   240,   240,   240,   241,
 +     241,   241,   242,   241,   243,   241,   244,   241,   245,   241,
 +     241,   241,   241,   241,   241,   241,   241,   241,   241,   246,
 +     241,   247,   241,   248,   241,   249,   241,   250,   241,   251,
 +     241,   252,   241,   253,   241,   254,   241,   255,   255,   256,
 +     256,   256,   256,   256,   256,   256,   256,   256,   256,   256,
 +     256,   256,   256,   256,   257,   257,   258,   258,   259,   259,
 +     260,   260,   261,   261,   261,   261,   261,   261,   261,   261,
 +     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
 +     261,   261,   261,   262,   262,   262,   263,   263,   263,   264,
 +     264,   264,   264,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   266,   266,   266,   266,   266,
 +     266,   266,   266,   266,   266,   267,   266,   266,   266,   266,
 +     266,   266,   266,   266,   266,   266,   266,   266,   266,   266,
 +     266,   266,   266,   266,   268,   268,   268,   268,   268,   269,
 +     269,   269,   269,   270,   270,   271,   271,   271,   271,   271,
 +     271,   272,   272,   273,   273,   273,   273,   273,   273,   273,
 +     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
 +     273,   274,   274,   274,   274,   275,   275,   275,   275,   276,
 +     276,   277,   277,   278,   278,   278,   278,   279,   279,   279,
 +     279,   279,   279,   279,   279,   279,   279,   279,   279,   280,
 +     279,   281,   281,   282,   282,   283,   283
 +=======
 +       0,   191,   192,   192,   193,   193,   194,   194,   194,   194,
 +     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
 +     194,   195,   195,   196,   196,   196,   196,   196,   196,   197,
 +     197,   197,   197,   198,   198,   198,   198,   198,   198,   199,
 +     199,   200,   200,   202,   203,   201,   204,   204,   206,   205,
 +     207,   207,   209,   208,   210,   210,   212,   211,   213,   213,
 +     213,   213,   213,   214,   214,   215,   215,   216,   216,   217,
 +     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
 +     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
 +     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
 +     217,   218,   218,   219,   219,   219,   220,   219,   219,   221,
 +     219,   222,   222,   223,   223,   224,   224,   225,   225,   225,
 +     226,   226,   227,   227,   227,   228,   228,   229,   229,   230,
 +     230,   231,   231,   232,   232,   233,   233,   234,   234,   234,
 +     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
 +     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
 +     234,   234,   234,   234,   234,   234,   235,   235,   235,   235,
 +     235,   235,   235,   235,   236,   236,   237,   237,   237,   237,
 +     237,   237,   238,   238,   238,   238,   238,   238,   238,   238,
 +     238,   239,   239,   239,   239,   239,   240,   240,   241,   241,
 +     241,   241,   241,   241,   242,   242,   242,   242,   242,   242,
 +     242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
 +     242,   242,   242,   243,   243,   243,   243,   243,   243,   243,
 +     243,   243,   243,   244,   244,   244,   245,   244,   246,   244,
 +     247,   244,   248,   244,   244,   244,   244,   244,   244,   244,
 +     244,   244,   244,   249,   244,   250,   244,   251,   244,   252,
 +     244,   253,   244,   254,   244,   255,   244,   256,   244,   257,
 +     244,   258,   258,   259,   259,   259,   259,   259,   259,   259,
 +     259,   259,   259,   259,   259,   259,   259,   259,   260,   260,
 +     261,   261,   262,   262,   263,   263,   264,   264,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   266,
 +     266,   266,   267,   267,   267,   268,   268,   268,   268,   269,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   270,   270,   270,   270,   270,   270,   270,   270,   270,
 +     270,   271,   270,   270,   270,   270,   270,   270,   270,   270,
 +     270,   270,   270,   270,   270,   270,   270,   270,   270,   270,
 +     270,   272,   272,   272,   272,   272,   273,   273,   273,   273,
 +     274,   274,   275,   275,   275,   275,   275,   275,   276,   276,
 +     277,   277,   277,   277,   277,   277,   277,   277,   277,   277,
 +     277,   277,   277,   277,   277,   277,   277,   277,   277,   277,
 +     277,   277,   277,   277,   277,   277,   277,   277,   278,   278,
 +     278,   278,   279,   279,   279,   279,   280,   280,   281,   281,
 +     282,   282,   282,   282,   283,   283,   283,   283,   283,   283,
 +     283,   283,   283,   283,   283,   283,   283,   283,   284,   283,
 +     285,   285,   286,   286,   287,   287
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
++=======
+      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+       63,   425,   426,   427,   428,    60,   429,    62,   430,    43,
+       45,    42,    47,    37,    33,   431,   432,   433,    94,    40,
+       41,    91,    93,    46,    35,    44,   123,   125,   126
+ };
+ # endif
  
- /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
- static const yytype_uint8 yyr2[] =
+ #define YYPACT_NINF -1312
++>>>>>>> upstream/2.10.1+dfsg1
+ 
+ #define yypact_value_is_default(Yystate) \
+   (!!((Yystate) == (-1312)))
+ 
+ #define YYTABLE_NINF -487
+ 
+ #define yytable_value_is_error(Yytable_value) \
+   0
+ 
+   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+      STATE-NUM.  */
+ static const yytype_int16 yypact[] =
  {
++<<<<<<< HEAD
 +       0,     2,     1,     2,     0,     2,     1,     1,     1,     1,
 +       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
 +       1,     1,     2,     5,     5,     7,     7,     7,     9,     6,
 +       6,     6,     8,     0,     2,     2,     2,     2,     2,     1,
 +       3,     1,     3,     0,     0,    10,     1,     3,     0,    13,
 +       1,     3,     0,    15,     8,    14,     0,     6,     1,     1,
 +       1,     1,     1,     1,     1,     1,     1,     1,     1,     5,
 +<<<<<<< HEAD
 +       5,     4,     6,     7,     7,     7,     9,     9,     3,     6,
 +       6,     4,     6,     9,     6,     9,     5,     8,     8,    11,
 +       6,     9,     5,     7,     9,     9,    11,     7,     9,     9,
 +       0,     1,     0,     3,     5,     0,     9,     5,     0,     9,
 +       0,     3,     3,     5,     0,     2,     3,     5,     3,     0,
 +       2,     3,     3,     5,     1,     1,     0,     5,     0,     2,
 +       7,     0,     9,     6,     7,     4,     7,     8,     8,     7,
 +       7,    11,     8,     8,     0,     9,     8,     9,     3,     4,
 +      10,     7,     7,     8,     8,    12,     0,     9,     8,     7,
 +       8,     0,     9,     5,    11,     5,     9,     9,     4,     9,
 +       9,     1,     1,     0,     2,     6,     6,     6,     6,     8,
 +      10,    14,    16,    12,     8,     8,     6,    14,     4,     6,
 +       6,     3,     4,     5,     6,     3,     3,     4,     5,     4,
 +       5,     3,     7,     7,     3,     7,     3,     2,     2,     2,
 +       2,    15,     2,     2,     2,     2,     2,    16,     3,     6,
 +       8,     8,    10,     1,     2,     1,     3,     4,     1,     5,
 +      11,    13,     0,     7,     0,    13,     0,    15,     0,     6,
 +       8,     8,     8,    12,    12,    12,    14,    14,    14,     0,
 +      12,     0,    12,     0,    12,     0,    16,     0,    16,     0,
 +      16,     0,    18,     0,    18,     0,    18,     1,     2,     5,
 +       7,     9,     2,     2,     2,     3,     2,     3,     2,     3,
 +       2,     3,     9,     6,     0,     3,     0,     1,     0,     2,
 +       0,     2,     7,     6,     8,     5,     3,     7,     5,     4,
 +       6,     6,    12,    10,    10,    10,    10,    10,     4,     4,
 +       4,     4,     4,     2,     3,     6,     1,     1,     1,     2,
 +       5,     7,    10,     1,     3,     2,     2,     2,     3,     3,
 +       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
 +       3,     3,     5,     4,     4,     4,     4,     4,     4,     4,
 +       4,     4,     4,     6,     4,     4,     4,     4,     4,     4,
 +       4,     6,     6,     6,     4,     1,     1,     1,     1,     1,
 +       1,     1,     1,     1,     1,     0,     6,     1,     4,     4,
 +       4,     4,     4,     2,     5,     5,     3,     6,     4,     7,
 +       6,     6,     6,     4,     1,     2,     2,     3,     3,    11,
 +       9,     7,     7,     1,     3,     1,     1,     2,     3,     4,
 +       5,     1,     1,     2,     3,     3,     5,     4,     2,     2,
 +       2,     2,     5,     5,     5,     5,     1,     1,     3,     4,
 +       6,     1,     1,     3,     3,     9,     7,     1,     5,     3,
 +       6,     1,     3,     1,     1,     3,     6,     1,     1,     1,
 +       4,     6,     6,     4,     4,     8,     4,     4,     6,     0,
 +       6,     1,     3,     5,     5,     1,     1
 +=======
 +       5,     4,     6,     6,     7,     7,     7,     9,     9,     3,
 +       6,     6,     4,     6,     9,     6,     9,     5,     8,     8,
 +      11,     6,     9,     5,     7,     9,     9,    11,     7,     9,
 +       9,     0,     1,     0,     3,     5,     0,     9,     5,     0,
 +       9,     0,     3,     3,     5,     0,     2,     3,     5,     3,
 +       0,     2,     3,     3,     5,     1,     1,     1,     1,     1,
 +       1,     1,     1,     0,     5,     0,     2,     7,     8,     6,
 +       7,     4,     7,     8,     8,     7,     7,    11,     8,     8,
 +       8,     8,     9,     3,     4,    10,     7,     7,     8,     8,
 +      12,     8,     8,     7,     8,     8,     5,    11,     5,     9,
 +       9,     4,     9,     9,     1,     1,     0,     2,     6,     6,
 +       6,     6,     8,    10,    14,    16,    12,     8,     8,     6,
 +      14,     4,     6,     6,     3,     4,     5,     6,     3,     3,
 +       4,     5,     4,     5,     3,     5,     7,     7,     3,     7,
 +       3,     2,     2,     2,     2,    15,     2,     2,     2,     2,
 +       2,    16,     3,     6,     8,     8,    10,     1,     2,     1,
 +       3,     4,     1,     5,    11,    13,     0,     7,     0,    13,
 +       0,    15,     0,     6,     8,     8,     8,    12,    12,    12,
 +      14,    14,    14,     0,    12,     0,    12,     0,    12,     0,
 +      16,     0,    16,     0,    16,     0,    18,     0,    18,     0,
 +      18,     1,     2,     5,     7,     9,     2,     2,     2,     3,
 +       2,     3,     2,     3,     2,     3,     9,     6,     0,     3,
 +       0,     1,     0,     2,     0,     2,     0,     2,     7,     6,
 +       8,     5,     3,     7,     5,     4,     6,     6,    13,    10,
 +      10,    10,    10,    10,     4,     4,     4,     4,     4,     2,
 +       3,     6,     1,     1,     1,     2,     5,     7,    10,     1,
 +       3,     2,     2,     2,     3,     3,     3,     3,     3,     3,
 +       3,     3,     3,     3,     3,     3,     3,     3,     5,     4,
 +       4,     4,     4,     4,     4,     4,     4,     4,     4,     6,
 +       4,     4,     4,     4,     4,     4,     4,     6,     6,     6,
 +       4,     1,     1,     1,     1,     1,     1,     1,     1,     1,
 +       1,     0,     6,     1,     4,     4,     4,     4,     4,     2,
 +       5,     5,     3,     6,     4,     7,     6,     6,     6,     6,
 +       4,     1,     2,     2,     3,     3,    11,     9,     7,     7,
 +       1,     3,     1,     1,     2,     3,     4,     5,     1,     1,
 +       2,     3,     3,     5,     4,     2,     2,     2,     2,     3,
 +       3,     3,     3,     5,     5,     5,     5,    16,    16,    16,
 +      16,     1,     1,     3,     3,     4,     6,     6,     1,     1,
 +       3,     3,     9,     7,     1,     5,     3,     6,     1,     3,
 +       1,     1,     3,     6,     1,     1,     1,     4,     6,     4,
 +       4,     4,     8,     4,     8,     4,     6,     4,     0,     6,
 +       1,     3,     5,     5,     1,     1
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+     6712,    53,   119,  6828, -1312, -1312,  3430,    12,   -42,   -89,
+      -20,    24,   173,   183,   196,   238,    -4,   247,   251,    73,
+      126,  -105,  -105,  -158,    85,   134,    -1,   149,   159,    15,
+      186,   206,   303,   313,   327,   424,   241,   -25,   365,   377,
+      712,   396,   677,   720,   236,   296,   463,   163,   320,   -78,
+      -78,   354,   340,    22,   476,   488,   514,     8,    79,   523,
+      543,   419,   625,   664,   670,  4896,   676,   536,   570,   577,
+       17,    19, -1312,   604, -1312,   682,   800,   624, -1312,   814,
+      815,    38,    44, -1312, -1312, -1312,  6576,  6576, -1312, -1312,
+    -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312,
+    -1312, -1312, -1312, -1312,    65, -1312,  -117,   115, -1312,    48,
+    -1312, -1312, -1312, -1312,  -105,  -105,  -105,  -105,  -105,  -105,
+     -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,
+     -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,   636,
+      637,   645,   660,   666,   683,  -105,   684, -1312,  -105, -1312,
+    -1312, -1312, -1312, -1312,  -105,  -105,   869,   697,   708,   715,
+     -105,   721,   732, -1312, -1312, -1312, -1312,  6576,  6576,  6576,
+     6576,  6576,    18,   814,   610,   735,   372,   782, -1312,   749,
+      873,     3,  -106,   888,  6576,  2389,  2389, -1312,  6576, -1312,
+    -1312, -1312, -1312,  2389, -1312, -1312, -1312, -1312, -1312, -1312,
+     2194,   814,  6576,  6394,  6576,  6576,   746,  6576,  6394,  6576,
+     6576,   757,  6394,  6576,  6576,  5272,   761,   781, -1312,  6394,
+     4896,  4896,  4896,   779,   789,  4896,  4896,  4896,   793,   798,
+      806,   844,   850,   858,   864,   865,   831,  1046,  1000,  5272,
+       17,   862,   863,   -78,   -78,   -78,  6576,  6576,   -72, -1312,
+       98,   -78,   894,   909,   915,  3627,   100,   -76,   913,   923,
+      928,  4896,  4896,  5272,   932,     5,   803, -1312,   842,  1077,
+     1154, -1312,   976,   977,   980,  4896,  4896,   989,  1005,  1007,
+      506, -1312,  1008,    37,    36,    39,    41,   701,  5460,  6576,
+     3888, -1312, -1312,   475, -1312,  1175, -1312,   158,   167,  1195,
+     6576,  6576,  6576,  1009,  6576,  1025,  1064,  6576,  6576, -1312,
+    -1312,  6576,  1006,  1216, -1312,  1218, -1312,  1221, -1312,   500,
+      837,  5642, -1312,  5272,  5272,  6576,  6576,  1032,   568,  2194,
+    -1312, -1312, -1312, -1312, -1312, -1312,  5272,  1223,  1040,  6576,
+     6576,  1228,  6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576,
+     6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576,
+     6576,  6576,  6576,  6576,  2389,  2389,  2389,  2389,  2389,  2389,
+     5272,  2389,  2389,  6576,  2389,  2389,  6576,  2194,  6576,  2389,
+     2389,  2389,  2389,   814,  2194,  1045,  1045,  1045,  4487,  8443,
+      366,  1041,  1231,  -105,  1043, -1312,  1047,  2672,  6576, -1312,
+    -1312,  6394,   102, -1312,  6576,  6576,  6576,  6576,  6576,  6576,
+     6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576,  6576, -1312,
+    -1312,  6576,  6576, -1312, -1312,   965,   -41,  -125, -1312, -1312,
+      350,  4266, -1312,   382,   511,   613,  1050,  1053,  4675,  6394,
+     3014, -1312,   402,  8788,  8809,  6576,  8830,   469,  8851,  8872,
+     6576,   546,  8893,  8914,  1242,  6576,  6576,   580,  1247,  1248,
+     1249,  6576,  6576,  1251,  1252,  1252,  6576,  6212,  6212,  6212,
+     6212,  6576,  6576,  6576,  6394,  6394,  5830,  1066,  1256,  1067,
+    -1312, -1312,   109, -1312, -1312,  4515,  6207,   -78,   -78,   610,
+      610,   123,  6576,  6576,  6576,  3627,  3627,  6576,  2672,   145,
+    -1312,  6576,  6576,  6576,  6576,  6576,  1259,  1261,  1265,  6576,
+     1262,  6576,  6576,  1332, -1312, -1312,  6394,  6394,  6394,  1273,
+     1274,  6576,  6576,  6576,  6576,  6576,  1278,   582,   814, -1312,
+     1233,  6576, -1312,  1234, -1312,  1235, -1312,  1236,    46,    51,
+       55,    56,  6394,  1045, -1312,  8935, -1312,   588,  6576,  5648,
+    -1312,  6576,  6576,   617, -1312,  8956,  8977,  8998,  1151,  6389,
+    -1312,  1092,  3071,  9019,  8466, -1312, -1312,  1461, -1312,  2031,
+     6576, -1312, -1312,  1100,   653,  9040,  8489,  6576,  6394,   102,
+     1285,  1286, -1312,  6576,  9061,  8512,    90,  8420,  8420,  8420,
+     8420,  8420,  8420,  8420,  8420,  8420,  8420,  8420,  7328,  8420,
+     8420,  8420,  8420,  8420,  8420,  8420,  7354,  7380,  7406,   495,
+      632,   495,  1108,  1109,  1106,  1112,  1116,  1117,  7432,   422,
+      671,  9523, -1312,  1317,  1123,  1113,   435,   671,  1114,  1130,
+      437,   260,  2194,  6576,  1315,  1318,    30,   671, -1312,   -29,
+       25,    33,    -5, -1312,  3882,   690, -1312,  5272,  3143,  2940,
+     2327,  1035,  1035,   310,   310,   310,   310,   268,   268,  1045,
+     1045,  1045,  1045,    35,  9082,  8535, -1312,  6576,  1323,     9,
+     6394,  1340,  6394,  6576,  1342,  2389,  1347, -1312,   814,  1350,
+     2389,  6576,  2194,  1352,  6394,  6394,  1222,  1357,  1359,  9103,
+     1372,  1241,  1375,  1376,  9124,  1250,  1379,  1380,  6576,  9145,
+     4025,  1161, -1312, -1312, -1312,  9166,  9187,  6576,  5272,  1384,
+     1386,  9208,  1200,  9523,  1198,  1204,  9523,  1202,  1205,  9523,
+     1203,  1210,  9523,  1206,  9229,  9250,  9271,   694,   695,  6394,
+     1209, -1312, -1312,  2060,  2546,   -78,  6576,  6576, -1312, -1312,
+     1217,  1219,  3627,  7458,  7484,  7510,  4078,   518,   -78,  3469,
+     9292,  4213,  9313,  9334,  9355,  6576,  1397, -1312,  6576,  9376,
+    -1312,  8558,  8581, -1312,   698,   705,   706, -1312, -1312,  8604,
+     8627,  7536,  8650,   167,  6394, -1312,  1226,  1230,  4420,  1237,
+     1238,  1243, -1312,  6394, -1312,  6394, -1312,  6394, -1312,  6394,
+      710, -1312, -1312,  3190,  6394,  1045, -1312,  6394, -1312,  1412,
+     1415,  1420,  1239,  6576,  4747,  6576,  6576, -1312,     6, -1312,
+    -1312,  4937,  1245,  5272,  1424,   437,   437,  4454,   718,  5272,
+    -1312, -1312,  8673,   167,   288, -1312, -1312, -1312, -1312, -1312,
+    -1312, -1312, -1312, -1312, -1312, -1312, -1312,  6576, -1312, -1312,
+    -1312, -1312, -1312, -1312, -1312,  6576,  6576,  6576, -1312,  6394,
+    -1312, -1312, -1312, -1312,  2389,  5272,  2389,  2389,  2194, -1312,
+    -1312, -1312, -1312, -1312,  6576, -1312, -1312,  2389, -1312, -1312,
+    -1312,  6576,  1425,   170,  6576,  1440,  1442,  1460, -1312,  1443,
+     1263,    17,  1446, -1312,  6394,  6394,  6394,  6394, -1312,   671,
+     1447,  6576, -1312,  1266,  1267,  1272, -1312,  1451, -1312, -1312,
+    -1312, -1312, -1312,   167,   167,  8696, -1312, -1312,  1281,  2389,
+      524, -1312,   646,  7562, -1312, -1312, -1312,  1452, -1312, -1312,
+     8420,   671,   -78,  3014, -1312,   838,  5272,  5272,  1454,  5272,
+      839,  5272,  5272,  1455,  1389,  5272,  5272,  1604,  1464,  1465,
+     6394,  1468,  1469,  3234, -1312, -1312,  1471, -1312,  1472,   102,
+     6576,   102,  6576,   102,  6576,   102,  6576,  1473,  1474,  1475,
+     1476,  1477,   725,  1482,  5125, -1312, -1312,   155,  7588,  7614,
+    -1312, -1312,  4608,   -92,   -78,   -78,   -78,  1498,  1497,  1282,
+     1501,  1320,    34,    49,    57,    63,   647, -1312,   165, -1312,
+      518,  1503,  1505,  1506,  1507,  1509,  9523, -1312,  1726,  1316,
+     1511,  1512,  1515,  1444,  6576,  1518,  1520,  6576,   -70,   730,
+    -1312,  6576, -1312,  6576,  6576,  6576,   739,   743,   744,   772,
+    -1312,  6576,   778,   784,  5272,  5272,  5272,  1523,  7640, -1312,
+     3214,   557,  1524,  1526, -1312,  5272,  1334, -1312,  6576,  1537,
+     6576,  1539, -1312,   671,  1540,  1541, -1312,  1528, -1312,  1542,
+     8420,  8420,  8420,  8420,   667,  1360,  1366,  1367,  1369,  1368,
+      675,   679,  9397,  1371,  1995, -1312,   441,  1382,  1558,  2155,
+    -1312, -1312, -1312,    17,  6576, -1312,   791, -1312,   795,   796,
+      804,   805,   102, -1312,  9523,  1387,  6576,  6576,  5272,  1373,
+    -1312, -1312, -1312,  1385, -1312,  1567,    61,  1571,  6576,  4459,
+     1573,  1575,    76,  1388,  1392,  1494,  1494,  5272,  1579,  1393,
+     1394,  1585,  1589,  5272,  1400,  1591,  1593, -1312,  1595,  5272,
+      808,  5272,  5272,  1597,  1596, -1312,  5272,  5272,  9523,  5272,
+     9523,  5272,  9523,  5272,  9523,  5272,  5272,  5272,  1409,  1413,
+     1609,   489, -1312,  6576,  6576,  6576,  1421,  1422,  -122,  -102,
+      -83,  1429, -1312,  5272, -1312,  6576, -1312,  1605, -1312,  1615,
+    -1312,  1616, -1312,  1618, -1312, -1312,  3627,   717,  5084, -1312,
+     1432,  1433,  5836, -1312,  6394, -1312, -1312, -1312,  1449,  2197,
+    -1312, -1312,  8719,  1621,   671,  7666,  7692,  7718,  7744, -1312,
+    -1312, -1312, -1312,  9523, -1312,   671,  1641,  1643,  1516, -1312,
+     6576,  6576,  6576, -1312,  1644,   517,  1457,  1647,  2304, -1312,
+     2401, -1312,   102, -1312, -1312,   130, -1312, -1312, -1312, -1312,
+    -1312, -1312,  2389, -1312, -1312, -1312,  2194,  1650, -1312, -1312,
+       20, -1312, -1312, -1312, -1312, -1312,  2194,  6576,  1649,  1652,
+       30, -1312,  1651,  8742,    17, -1312,  1654,  1659,  1660,  1661,
+     5272,  6576,  7770,  7796,   829, -1312,  6576,  1664, -1312, -1312,
+     2389, -1312,  7822,  4083,  9523, -1312, -1312, -1312, -1312,  6576,
+     6576,   -78,  1663,  1666,  1667, -1312,  6576,  6576, -1312, -1312,
+     1668,  6576, -1312, -1312,  1665,  1669,  1481,  1672,  1544,  6576,
+    -1312,  1673,  1675,  1687,  1688,  1689,  1694,   968,  1696,  6394,
+     6394,  6576, -1312,  6212,  5590,  9418,  2476,   610,   610,   -78,
+     1698,   -78,  1700,   -78,  1702,  6576,   287,  1514,  9439, -1312,
+    -1312, -1312, -1312,  5778,   175, -1312,  1704,  3693,  1705,  5272,
+      -78,  3693,  1706,   840,  6576, -1312,  1707,   167, -1312,  6576,
+     6576,  6576,  6576, -1312, -1312, -1312,  5272,  3688,   329,  9460,
+    -1312, -1312,  4520,  5272, -1312, -1312, -1312,  5272, -1312,  1538,
+      671,  4271,  4708,  2194,  1708,  2523, -1312,  1709,  1712, -1312,
+     1545, -1312, -1312, -1312, -1312, -1312,  1727,   652,  9523,  6576,
+     6576,  5272,  1543,   841,  9523, -1312,  1728,  6576, -1312, -1312,
+     5966,  6112,   457, -1312, -1312, -1312,  6140,  6170, -1312,  6336,
+     1730, -1312,  5272, -1312,  1670,  1731,  9523, -1312, -1312, -1312,
+    -1312, -1312, -1312,  1546, -1312, -1312,   851,   887,  6018,  2735,
+     1734,  1547, -1312,  6576, -1312,  1548,  1551,   179, -1312,  1553,
+      202, -1312,  1555,   204, -1312,  1556,  8765,  1735,  5272,  1737,
+     1557,  6576, -1312,  6024,   240, -1312,   891,   252,   259, -1312,
+     1749,  6475, -1312,  7848,  7874,  7900,  7926,  1622,  6576, -1312,
+     6576, -1312, -1312,  6394,  2771,  1751,  1563,  1755, -1312, -1312,
+     3888, -1312, -1312,  2389,  9523, -1312, -1312, -1312, -1312,    17,
+    -1312,  1625, -1312, -1312,  6576,  7952,  7978, -1312,  5272,  6576,
+     1759, -1312,  8004, -1312, -1312,  1760,  1764,  1765,  1782,  1783,
+     1784,   892,  1598, -1312,  5272,   608,   651,  6394, -1312, -1312,
+      610,  3830, -1312, -1312,  3627,   518,  3627,   518,  3627,   518,
+     1789, -1312,   899,  5272, -1312,  6503,   -78,  1790,  6394,   -78,
+    -1312, -1312,  6576,  6576,  6576,  6576,  6576,  6824,  6852,   902,
+    -1312, -1312,  1791, -1312,   903,  1159,   906,  1792, -1312,  1606,
+     9523,  6576,  6576,   925,  9523, -1312,  6576,   930,   934, -1312,
+    -1312, -1312, -1312, -1312, -1312,  1607,  6576,   954,  1608,   -78,
+     5272,  1794,  1612,   -78,  1795,   957,  1613,  6576, -1312,  6880,
+      342,  1068,  6908,   348,  1155,  6936,   368,  1194, -1312,  5272,
+     1803,  1718,  5313,  1619,   379, -1312,   960,   381,  8030,  8056,
+     8082,  8108,  2791, -1312, -1312,  1810, -1312,  6576, -1312,  2194,
+    -1312, -1312,  6576,  9481,  8134,    29,  8160, -1312, -1312,  6576,
+     6964,  1814,   -78,    83, -1312, -1312,   -78,    86, -1312,  1820,
+    -1312,  6992,  1821,  6576,  1823,  1827,  6576,  1828,  1829,  6576,
+     1834,  1648, -1312,  6576, -1312,   518, -1312,  6394,  1835,  6024,
+     6576,  6576,  6576,  6576, -1312, -1312,  2884, -1312,   961, -1312,
+     6576, -1312,  5272,  6576,  8186, -1312, -1312,   436, -1312,   440,
+    -1312, -1312, -1312, -1312,  1653,  7020, -1312, -1312,  1655,  7048,
+    -1312, -1312,  1656,  7076, -1312,  1840,  2837,  1254,  5501,   964,
+    -1312,   481,   967,  8212,  8238,  8264,  8290,  2194,  1841,  1657,
+     9502,   973,  7104,  6576,   -78,   -78,   518,  1842,   518,  1844,
+      518,  1848, -1312, -1312, -1312, -1312,   518,  1849,  6394,  1852,
+     6576,  6576,  6576,  6576, -1312, -1312,  2389, -1312,  1685,  1876,
+     7132,   491,   499,  1322, -1312,  1690,  1492, -1312,  1691,  1576,
+    -1312,  1692,  1716, -1312,   982, -1312,  8316,  8342,  8368,  8394,
+      990, -1312,  1693,  5272, -1312,  1877,  6576,  6576,  1878,   518,
+     1879,   518,  1885,   518, -1312,  1886,  6576,  6576,  6576,  6576,
+     2389,  1888,  2389,   997, -1312,  7160,  7188, -1312,  1854, -1312,
+     2090, -1312,  2340, -1312,  7216,  7244,  7272,  7300, -1312, -1312,
+      998, -1312,  1904,  1905,  1906,  1910,  1911,  1913, -1312, -1312,
+    -1312, -1312,  2389,  1914, -1312, -1312, -1312, -1312, -1312, -1312,
+    -1312, -1312
++>>>>>>> upstream/2.10.1+dfsg1
  };
  
- /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-    Performed when YYTABLE doesn't specify something else to do.  Zero
-    means the default is an error.  */
+   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+      Performed when YYTABLE does not specify something else to do.  Zero
+      means the default is an error.  */
  static const yytype_uint16 yydefact[] =
  {
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +       0,     0,     0,     2,     3,     1,   465,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   223,     0,
 +     228,     0,     0,     0,   225,     0,     0,     0,     0,   316,
 +     317,   318,     0,     5,     7,     6,     8,     9,    10,    19,
 +      11,    12,    13,    18,    17,    14,    15,    16,     0,    20,
 +     466,     0,   365,   465,   447,   366,   367,   368,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   448,
 +     449,   372,   373,   374,     0,     0,     0,     0,     0,     0,
 +       0,     0,   369,   370,   371,     0,     0,     0,    65,    66,
 +       0,     0,   173,     0,     0,     0,   323,     0,   443,   466,
 +     377,     0,     0,     0,     0,   210,     0,   212,   213,   209,
 +     214,   215,   102,   110,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     216,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   131,   144,   156,   161,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   394,     0,     0,     0,     0,     0,   173,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   173,
 +       0,   313,     0,     0,     0,     0,     0,     0,     0,     0,
 +     465,   412,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   426,   427,   405,   411,     0,   406,   377,     0,     0,
 +       0,     0,   437,     0,     0,     0,     0,     0,   207,   208,
 +       0,     0,   224,     0,   173,     0,   173,   465,     0,   319,
 +       0,     0,     0,     0,     0,    58,    62,    61,    60,    59,
 +      64,    63,     0,     0,     0,     0,     0,    65,    66,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +=======
 +       0,     0,     0,     2,     3,     1,   484,     0,     0,     0,
++=======
+        0,     0,     0,     2,     3,     1,   510,     0,     0,     0,
++>>>>>>> upstream/2.10.1+dfsg1
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   227,
-        0,   232,     0,     0,     0,   229,     0,     0,     0,     0,
-      322,   323,   324,     0,     5,     7,     6,     8,     9,    10,
-       19,    11,    12,    13,    18,    17,    14,    15,    16,     0,
-       20,   485,     0,   371,   484,   464,   372,   373,   374,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,   240,     0,   245,     0,     0,     0,   242,     0,
+        0,     0,     0,   340,   341,   342,     0,     0,     5,     7,
+        6,     8,     9,    10,    20,    11,    12,    13,    14,    19,
+       18,    15,    16,    17,     0,    21,   511,     0,   389,   510,
+      487,   390,   391,   392,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
++<<<<<<< HEAD
 +       0,     0,   465,     0,   466,   378,   379,   380,     0,     0,
 +       0,     0,     0,     0,     0,     0,   375,   376,   377,     0,
 +       0,     0,    65,    66,     0,     0,   176,     0,     0,     0,
 +     329,     0,   460,   485,   383,     0,     0,     0,     0,   214,
 +       0,   216,   217,   213,     0,   218,   219,   103,   111,     0,
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        0,     0,     0,     0,     0,     0,     0,   488,     0,   503,
+      490,   396,   397,   398,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,   393,   394,   395,   489,     0,     0,     0,
+       66,    67,     0,     0,   187,     0,     0,     0,   347,     0,
+      483,   511,   402,     0,     0,     0,     0,   227,     0,   229,
+      230,   225,   226,     0,   231,   232,   109,   117,    66,    67,
++>>>>>>> upstream/2.10.1+dfsg1
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,   220,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   233,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   326,   325,
 +     327,     0,     0,     0,     0,     0,     0,   465,   466,     0,
 +       0,   172,     0,   171,     0,     0,   204,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +<<<<<<< HEAD
 +       0,     0,    33,   201,     0,   383,   148,     0,   465,     0,
 +     443,   444,     0,     0,   100,   100,     0,     0,   431,   432,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
++<<<<<<< HEAD
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   288,   288,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   173,   173,     0,
 +     396,   395,     0,     0,     0,     0,   173,   173,     0,     0,
 +       0,     0,     0,     0,     0,   238,     0,   173,     0,     0,
 +       0,     0,     0,   290,     0,     0,     0,     0,   191,     0,
 +       0,     0,   314,     0,     0,     0,     0,     0,     0,     0,
 +       0,    66,     0,     0,     0,   418,     0,   419,   420,   421,
 +       0,     0,     0,     0,     0,   325,   413,     0,   407,     0,
 +       0,     0,   296,   206,     0,     0,     0,     0,     0,   173,
 +       0,     0,     0,     0,   226,   195,     0,   196,     0,     0,
 +     218,     0,     0,     0,     0,     0,     0,     0,    78,     0,
 +       0,   386,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   461,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   375,   459,     0,     0,     0,     0,
 +       0,     0,   324,    58,     0,     0,    58,     0,     0,     0,
 +       0,     0,   168,     0,     0,     0,     0,   174,     0,     0,
 +       0,   341,   340,   339,   338,   334,   335,   337,   336,   329,
 +     328,   330,   331,   332,   333,     0,     0,   149,     0,     0,
 +       0,     0,     0,     0,     0,     0,   101,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   310,
 +     311,   312,     0,     0,     0,     0,   286,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   135,
 +     173,     0,     0,     0,     0,     0,   398,   397,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   232,     0,     0,
 +       0,     0,     0,     0,     0,   299,     0,     0,   192,     0,
 +       0,   188,     0,     0,     0,   309,   308,     0,     0,     0,
 +       0,   386,    67,    68,     0,   428,     0,     0,     0,     0,
 +       0,     0,     0,   324,   408,   415,     0,   330,   414,     0,
 +       0,     0,     0,     0,     0,     0,     0,   227,     0,   197,
 +     199,     0,     0,     0,     0,     0,     0,    81,    71,     0,
 +     378,   388,   343,   344,   345,   346,   347,   348,   349,   350,
 +     351,   364,   352,     0,   354,   355,   356,   357,   358,   359,
 +     360,     0,     0,     0,     0,   456,     0,   457,     0,   453,
 +     454,     0,     0,     0,   393,   114,   119,    92,     0,   450,
 +       0,   380,   381,     0,     0,     0,     0,     0,     0,     0,
 +      86,     0,     0,     0,     0,   382,     0,     0,     0,     0,
 +     463,     0,     0,    43,     0,     0,     0,    56,     0,    34,
 +      35,    36,    37,    38,   379,     0,   445,    23,    21,     0,
 +       0,    24,     0,     0,    69,   103,    70,   111,     0,   433,
 +     434,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   284,
 +     289,   287,     0,   295,     0,     0,   124,   125,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   198,   200,
 +       0,     0,     0,   163,   165,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     267,     0,   229,     0,     0,     0,     0,     0,     0,   291,
 +     298,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   378,     0,   429,   417,     0,     0,     0,     0,   409,
 +       0,     0,     0,     0,     0,     0,     0,   193,     0,     0,
 +       0,     0,     0,     0,   320,     0,     0,     0,   464,     0,
 +       0,   384,     0,     0,     0,     0,     0,   462,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
 +       0,     0,     0,    79,    82,    84,     0,     0,   441,     0,
 +      90,     0,     0,     0,     0,     0,   342,     0,     0,     0,
 +       0,     0,    29,   385,     0,    22,     0,     0,     0,     0,
 +       0,     0,     0,     0,   128,   128,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   133,     0,     0,     0,
 +       0,     0,     0,     0,   293,     0,     0,     0,     0,     0,
 +       0,     0,     0,   301,     0,     0,   194,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   273,     0,   272,     0,
 +     278,     0,   280,     0,   274,     0,   276,     0,   239,   268,
 +       0,     0,     0,   186,     0,     0,     0,   300,     0,   190,
 +     189,   315,     0,     0,    30,    31,     0,     0,     0,   422,
 +     423,   424,   425,   416,   410,     0,     0,     0,   438,     0,
 +       0,     0,   219,     0,     0,     0,     0,     0,     0,    80,
 +     203,   387,   202,   353,   361,   362,   363,   458,   452,     0,
 +     391,   392,     0,   376,   115,     0,   460,   120,   390,   451,
 +      74,    58,     0,     0,     0,     0,    73,     0,     0,     0,
 +     439,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     403,     0,     0,    25,    26,     0,    27,     0,     0,   104,
 +     107,   130,     0,     0,     0,     0,     0,     0,   134,     0,
 +       0,   151,   152,     0,     0,   136,   159,     0,     0,     0,
 +       0,   126,     0,   292,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,   205,     0,     0,     0,     0,   173,   173,
 +       0,   249,     0,   251,     0,   253,     0,   405,     0,     0,
 +     279,   281,   275,   277,     0,     0,   233,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   297,     0,   387,   430,
 +     139,   140,     0,     0,     0,     0,    93,    97,     0,     0,
 +     321,     0,    75,   389,     0,     0,     0,     0,     0,    87,
 +       0,     0,    88,     0,   442,   175,   176,   177,   178,     0,
 +       0,    39,     0,     0,     0,     0,     0,    41,   446,     0,
 +       0,   105,   108,     0,     0,   129,   137,   138,   142,     0,
 +       0,   153,     0,     0,   294,     0,   146,     0,     0,   285,
 +     158,     0,     0,     0,     0,   143,     0,   154,   160,     0,
 +       0,     0,     0,   402,     0,   401,     0,     0,     0,   240,
 +       0,     0,   241,     0,     0,   242,     0,     0,     0,     0,
 +       0,     0,     0,   185,     0,     0,   184,     0,     0,     0,
 +     179,     0,     0,    32,     0,     0,   436,     0,   221,   220,
 +       0,     0,     0,     0,     0,   455,     0,   116,   118,     0,
 +     121,   122,    83,    85,     0,    91,     0,    76,    44,     0,
 +       0,     0,   404,     0,     0,     0,    28,     0,   114,   119,
 +       0,     0,     0,     0,     0,     0,     0,     0,   147,   132,
 +     145,   157,   162,     0,     0,    98,    99,   173,     0,   166,
 +     167,     0,     0,     0,     0,     0,     0,     0,   269,     0,
 +       0,   173,     0,     0,     0,     0,     0,   170,   169,     0,
 +       0,     0,     0,    94,    95,     0,    77,     0,   431,     0,
 +       0,   440,     0,    40,     0,     0,     0,    42,    57,     0,
 +       0,     0,   303,   305,   304,   306,   307,   150,     0,     0,
 +       0,     0,     0,     0,   400,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   283,     0,     0,     0,   234,     0,
 +       0,   180,     0,     0,     0,   435,   222,     0,   322,     0,
 +     117,     0,   123,    89,     0,     0,     0,     0,     0,   106,
 +     109,     0,     0,     0,     0,   164,     0,   255,     0,     0,
 +     257,     0,     0,   259,     0,     0,     0,   270,     0,   230,
 +       0,   173,     0,     0,     0,   141,    96,     0,   112,     0,
 +      48,     0,    54,     0,     0,     0,   127,   155,   302,   399,
 +     243,     0,     0,   250,   244,     0,     0,   252,   245,     0,
 +       0,   254,     0,     0,     0,   236,     0,   183,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   261,     0,
 +     263,     0,   265,   271,   282,   235,   231,     0,     0,     0,
 +       0,   113,    45,     0,    52,     0,     0,     0,     0,   246,
 +       0,     0,   247,     0,     0,   248,     0,     0,   187,     0,
 +     181,     0,    46,     0,     0,   211,     0,     0,     0,     0,
 +       0,     0,     0,   237,     0,     0,     0,     0,     0,   217,
 +     256,     0,   258,     0,   260,     0,   182,    47,    49,     0,
 +      50,     0,     0,     0,     0,     0,     0,    55,   262,   264,
 +     266,    51,    53
 +=======
 +       0,     0,     0,     0,     0,     0,   401,     0,     0,     0,
 +       0,     0,   176,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   176,     0,   319,     0,     0,     0,
 +       0,     0,     0,     0,     0,   484,   419,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   441,   442,   412,   418,
 +       0,   413,   485,   383,     0,     0,     0,     0,   454,     0,
 +       0,     0,     0,     0,   211,   212,     0,   484,   485,     0,
 +     228,     0,   176,     0,   176,   484,     0,   325,     0,     0,
 +      65,    66,     0,     0,    58,    62,    61,    60,    59,    64,
 +      63,     0,     0,     0,     0,     0,    66,     0,     0,     0,
++=======
+        0,     0,     0,     0,     0,     0,     0,     0,     0,   424,
+        0,     0,     0,     0,     0,   187,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   510,     0,   187,   511,     0,
+        0,   337,     0,     0,     0,     0,     0,     0,     0,     0,
+      510,   442,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,   464,   465,   435,   441,     0,   436,   511,   402,     0,
+        0,     0,     0,   477,     0,     0,     0,     0,     0,   223,
+      224,     0,   510,     0,   241,     0,   187,     0,   187,   510,
+        0,     0,   343,     0,     0,    66,    67,     0,     0,    59,
+       60,    61,    62,    63,    64,    65,     0,     0,     0,     0,
++>>>>>>> upstream/2.10.1+dfsg1
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   332,
-      331,   333,     0,     0,     0,     0,     0,     0,     0,     0,
-      175,     0,   174,     0,     0,   208,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,    33,   204,     0,   389,   153,     0,   484,     0,   460,
-      461,     0,     0,   480,     0,   101,   101,     0,     0,   448,
-      449,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   350,   349,   351,     0,     0,
+        0,     0,     0,     0,     0,   186,     0,   185,     0,    68,
+       69,     0,     0,   220,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
+      216,     0,     0,   410,   164,     0,   510,     0,   483,   484,
+        0,     0,   506,     0,   107,   107,     0,     0,     0,     0,
+      471,   472,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   292,   292,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,   176,   176,
-        0,   403,   402,     0,     0,     0,     0,   176,   176,     0,
-        0,     0,     0,     0,     0,     0,   242,     0,   176,     0,
-        0,     0,     0,     0,   294,     0,     0,     0,     0,   194,
-        0,     0,     0,   320,     0,     0,     0,     0,     0,     0,
-        0,     0,    66,     0,     0,     0,   425,     0,     0,   426,
-        0,   427,     0,   428,     0,     0,     0,     0,     0,     0,
-      331,   420,     0,   414,     0,     0,     0,   302,    66,     0,
-      210,     0,     0,     0,     0,     0,   176,     0,     0,     0,
-        0,   230,   198,     0,   199,     0,     0,   222,     0,     0,
-        0,     0,     0,     0,     0,     0,    79,     0,     0,   392,
+        0,     0,     0,     0,   305,   305,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      187,   187,     0,   426,   425,     0,     0,     0,     0,   187,
+      187,     0,     0,     0,     0,     0,     0,     0,   255,     0,
+      187,     0,     0,     0,     0,     0,   307,     0,     0,     0,
+        0,     0,     0,     0,   205,   338,     0,     0,     0,     0,
+        0,     0,     0,     0,    66,    67,     0,     0,     0,   448,
+        0,     0,   449,     0,   450,     0,   451,     0,     0,     0,
+        0,     0,     0,   349,   443,     0,   437,     0,     0,     0,
+      315,    66,    67,     0,   222,     0,     0,     0,     0,     0,
+      187,     0,     0,     0,     0,   243,   210,     0,   211,     0,
+        0,   235,   187,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,    83,     0,     0,     0,   415,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,   381,   478,     0,     0,     0,     0,
-        0,     0,   330,    58,     0,     0,    58,     0,     0,     0,
-        0,     0,   171,     0,     0,     0,     0,   177,     0,     0,
-        0,   347,   346,   345,   344,   340,   341,   343,   342,   335,
-      334,   336,   337,   338,   339,     0,     0,   154,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,   102,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,   399,   504,     0,     0,     0,     0,     0,     0,     0,
+      348,     0,    59,     0,     0,     0,     0,     0,   182,     0,
+        0,     0,     0,   188,     0,     0,    59,     0,     0,   365,
+      364,   362,   363,   358,   360,   359,   361,   353,   352,   354,
+      355,   356,   357,     0,     0,     0,   165,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   108,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,   316,   317,   318,     0,     0,     0,     0,   290,     0,
-        0,     0,   125,   126,     0,   127,   128,     0,   129,   130,
-        0,   131,   132,     0,     0,     0,     0,     0,     0,   141,
-      176,     0,     0,     0,     0,     0,   405,   404,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   236,     0,     0,
-        0,     0,     0,     0,     0,   305,     0,     0,   195,     0,
-        0,   191,     0,     0,     0,   315,   314,     0,     0,     0,
-        0,   392,    67,    68,     0,   443,     0,     0,     0,     0,
-        0,     0,   429,     0,   430,     0,   431,     0,   432,     0,
-        0,   330,   415,   422,     0,   336,   421,     0,   444,     0,
-        0,     0,     0,     0,     0,     0,     0,   231,     0,   200,
-      202,     0,     0,     0,     0,     0,     0,     0,    82,    71,
-        0,   384,   394,   349,   350,   351,   352,   353,   354,   355,
-      356,   357,   370,   358,     0,   360,   361,   362,   363,   364,
-      365,   366,     0,     0,     0,   473,     0,   475,   469,   470,
-      471,     0,     0,     0,     0,     0,   400,   477,   115,   120,
-       93,     0,   467,     0,   386,   387,     0,     0,     0,     0,
-        0,     0,     0,    87,     0,     0,     0,     0,   388,     0,
-        0,     0,     0,   482,     0,     0,    43,     0,     0,     0,
-       56,     0,    34,    35,    36,    37,    38,   385,     0,   462,
-       23,    21,     0,     0,    24,     0,     0,   205,   481,    69,
-      104,    70,   112,     0,   450,   451,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,   288,   293,   291,     0,   301,     0,
+        0,     0,   334,   335,   336,     0,     0,     0,     0,   303,
+        0,     0,     0,   132,   133,     0,   135,   136,     0,   138,
+      139,     0,   141,   142,     0,     0,     0,     0,     0,     0,
+        0,   152,   187,     0,     0,     0,     0,     0,   428,   427,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,   249,
+        0,     0,     0,     0,     0,     0,     0,   318,     0,     0,
+      206,     0,     0,   202,     0,     0,     0,   333,   332,     0,
+        0,     0,     0,   415,     0,   466,     0,     0,     0,     0,
+        0,     0,   452,     0,   453,     0,   454,     0,   455,     0,
+        0,   348,   438,   445,     0,   354,   444,     0,   467,     0,
+        0,     0,     0,     0,     0,     0,     0,   244,     0,   212,
+      214,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       88,    74,     0,   404,   403,   417,   367,   368,   369,   370,
+      371,   372,   373,   374,   375,   388,   376,     0,   378,   379,
+      380,   381,   382,   383,   384,     0,     0,     0,   498,     0,
+      500,   494,   495,   496,     0,     0,     0,     0,     0,   423,
+      502,   121,   126,    99,     0,   491,   493,     0,   401,   407,
+      408,     0,     0,     0,     0,     0,     0,     0,    93,     0,
+        0,     0,     0,   409,     0,     0,     0,     0,   508,     0,
+        0,     0,    44,     0,     0,     0,    57,     0,    35,    36,
+       37,    38,    39,   406,   405,     0,   485,    24,    22,     0,
+        0,    25,     0,     0,   217,   507,    70,   110,    71,   118,
+        0,     0,     0,   473,   474,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,   201,   203,     0,     0,     0,   166,   168,     0,     0,
+        0,     0,     0,   301,   306,   304,     0,   314,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
++<<<<<<< HEAD
 +       0,     0,     0,   271,     0,   233,     0,     0,     0,     0,
 +       0,     0,   295,   304,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   384,     0,   445,     0,   424,     0,
 +       0,     0,     0,     0,     0,     0,   416,     0,     0,     0,
 +       0,     0,     0,     0,     0,   196,     0,     0,     0,     0,
 +       0,     0,   326,     0,     0,     0,   483,     0,     0,     0,
 +     390,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,    72,     0,     0,
 +       0,     0,    80,    83,    85,     0,     0,   458,     0,    91,
 +       0,     0,     0,     0,     0,   348,     0,     0,     0,     0,
 +       0,    29,   391,     0,    22,     0,     0,     0,     0,     0,
 +       0,     0,     0,   135,   135,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   139,     0,     0,     0,     0,
 +       0,     0,     0,   299,     0,     0,     0,     0,     0,     0,
 +       0,     0,   307,     0,     0,   197,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   277,     0,   276,     0,   282,
 +       0,   284,     0,   278,     0,   280,     0,   243,   272,     0,
 +       0,     0,   189,     0,     0,     0,   306,     0,   193,   192,
 +     321,     0,     0,    30,    31,     0,     0,     0,     0,     0,
 +       0,     0,   433,   434,   435,   436,   423,   417,     0,     0,
 +       0,     0,   455,     0,     0,     0,   223,     0,     0,     0,
 +       0,    73,     0,    81,     0,   207,   393,   206,   359,   367,
 +     368,   369,   476,     0,   397,   398,   399,     0,     0,   382,
 +     116,     0,   479,   121,   396,   468,    75,    58,     0,     0,
 +       0,     0,    74,     0,     0,     0,   456,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   410,     0,     0,    25,
 +      26,     0,    27,     0,     0,   105,   108,   137,     0,     0,
 +       0,     0,     0,     0,   140,     0,     0,   156,   157,     0,
 +       0,   142,   163,     0,     0,     0,     0,   133,     0,   298,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   209,
 +       0,     0,     0,     0,   176,   176,     0,   253,     0,   255,
 +       0,   257,     0,   412,     0,     0,   283,   285,   279,   281,
 +       0,     0,   237,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   303,     0,   393,   446,     0,     0,     0,     0,
 +     447,   145,   146,     0,     0,     0,     0,    94,    98,     0,
 +       0,   327,    76,     0,   395,     0,     0,     0,     0,     0,
 +       0,    88,     0,     0,    89,     0,   459,   178,   179,   180,
 +     181,     0,     0,    39,     0,     0,     0,     0,     0,    41,
 +     463,     0,     0,   106,   109,     0,     0,   136,   143,   144,
 +     148,     0,     0,   158,     0,     0,   300,     0,   151,     0,
 +       0,   289,   162,   138,   150,   161,   165,   149,     0,   159,
 +     164,     0,     0,     0,     0,   409,     0,   408,     0,     0,
 +       0,   244,     0,     0,   245,     0,     0,   246,     0,     0,
 +       0,     0,     0,     0,     0,   188,     0,     0,   187,     0,
 +       0,     0,   182,     0,     0,    32,     0,     0,     0,     0,
 +       0,     0,   453,     0,   225,   224,     0,     0,     0,     0,
 +       0,   472,   474,     0,   117,   119,     0,   122,   123,    84,
 +      86,     0,    92,     0,    77,    44,     0,     0,     0,   411,
 +       0,     0,     0,    28,     0,   115,   120,     0,     0,     0,
 +       0,     0,     0,     0,     0,   152,     0,     0,    99,   100,
 +     176,     0,   169,   170,     0,     0,     0,     0,     0,     0,
 +       0,   273,     0,     0,   176,     0,     0,     0,     0,     0,
 +     173,   172,     0,     0,     0,     0,     0,     0,     0,     0,
 +      95,    96,     0,    78,     0,   448,     0,     0,   457,     0,
 +      40,     0,     0,     0,    42,    57,     0,     0,     0,   309,
 +     311,   310,   312,   313,   155,     0,     0,     0,     0,     0,
 +       0,   407,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   287,     0,     0,     0,   238,     0,     0,   183,     0,
 +       0,     0,     0,     0,     0,     0,   452,   226,     0,   328,
 +       0,   118,     0,   124,    90,     0,     0,     0,     0,     0,
 +     107,   110,     0,     0,     0,   296,   167,     0,   259,     0,
 +       0,   261,     0,     0,   263,     0,     0,     0,   274,     0,
 +     234,     0,   176,     0,     0,     0,     0,     0,     0,     0,
 +     147,    97,     0,   113,     0,    48,     0,    54,     0,     0,
 +       0,   134,   160,     0,     0,   406,   247,     0,     0,   254,
 +     248,     0,     0,   256,   249,     0,     0,   258,     0,     0,
 +       0,   240,     0,   186,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   297,   308,     0,
 +     265,     0,   267,     0,   269,   275,   286,   239,   235,     0,
 +       0,     0,     0,     0,     0,     0,     0,   114,    45,     0,
 +      52,     0,     0,     0,     0,   250,     0,     0,   251,     0,
 +       0,   252,     0,     0,   190,     0,   184,     0,     0,     0,
 +       0,     0,    46,     0,     0,   215,     0,     0,     0,     0,
 +       0,     0,     0,   241,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,   221,   260,     0,   262,     0,   264,     0,
 +     185,     0,     0,     0,     0,    47,    49,     0,    50,     0,
 +       0,     0,     0,   437,   438,   439,   440,     0,     0,    55,
 +     266,   268,   270,    51,    53
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +/* YYDEFGOTO[NTERM-NUM].  */
 +static const yytype_int16 yydefgoto[] =
 +{
 +<<<<<<< HEAD
 +      -1,     2,     3,    83,   829,    84,    85,   615,  1250,  1256,
 +     819,   987,  1412,  1571,   820,  1532,  1599,   821,  1573,   822,
 +     823,   991,   312,   395,   164,   715,    86,   627,   404,  1358,
 +    1359,   405,  1407,   963,  1114,   964,  1117,   865,  1278,  1155,
 +     597,   435,   436,   437,   438,   271,   372,   373,    89,    90,
 +      91,    92,    93,    94,   272,   903,  1490,  1547,   685,  1300,
 +    1303,  1306,  1511,  1515,  1519,  1560,  1563,  1566,   899,   900,
 +    1023,   862,   656,   694,    96,    97,    98,    99,   273,   166,
 +     785,   451,   231,  1139,   274,   275,   276,   509,   284,   804,
 +     979,   564,   400,   786,   565,   169,   277
 +=======
 +      -1,     2,     3,    84,   872,    85,    86,   635,  1312,  1318,
 +     862,  1036,  1479,  1661,   863,  1612,  1697,   864,  1663,   865,
 +     866,  1040,   321,   404,   168,   745,    87,   649,   415,  1425,
 +    1426,   416,  1474,  1012,  1170,  1013,  1173,   681,   684,   687,
 +     690,  1340,  1211,   617,   276,   381,   382,    90,    91,    92,
 +      93,    94,    95,   277,   946,  1561,  1629,   715,  1362,  1365,
 +    1368,  1587,  1591,  1595,  1646,  1649,  1652,   942,   943,  1072,
 +     907,   678,   724,  1584,    97,    98,    99,   100,   278,   170,
 +     828,   462,   236,  1195,   279,   280,   281,   524,   290,   847,
 +    1028,   413,   409,   829,   414,   173,   283
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
 +   STATE-NUM.  */
 +<<<<<<< HEAD
 +#define YYPACT_NINF -1191
 +static const yytype_int16 yypact[] =
 +{
 +    5150,    28,    47,  5263, -1191, -1191,  2575,    11,     6,   -81,
 +     -47,    26,   142,   178,   188,   223,   241,    91,   108,  -149,
 +     156,   209,     1,   233,   255,    15,   268,   271,   240,   267,
 +     324,   455,   287,   476,   410,   465,    48,   490,   364,   535,
 +      61,   403,   533,   100,   432,   101,   101,   447,   -18,    46,
 +     -10,   587,   605,     9,    52,   615,   628,    72,   708,   712,
 +     713,  3297,   734,   522,   525,   560,    17,    39, -1191,   569,
 +   -1191,   753,   759,   594, -1191,   773,   777,    20,    21, -1191,
 +   -1191, -1191,  2334, -1191, -1191, -1191, -1191, -1191, -1191, -1191,
 +   -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191,    30, -1191,
 +      96,   217, -1191,     0, -1191, -1191, -1191, -1191,   -93,   -93,
 +     -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,
 +     -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,
 +     -93,   -93,   -93,   593,   613,   616,   617,   625,   630, -1191,
 +   -1191, -1191, -1191, -1191,   -93,   -93,   804,   637,   638,   646,
 +     650,   651, -1191, -1191, -1191,  2334,  2334,  2334,  2334,  2394,
 +      34,   832,   129,   658,   681,   237, -1191,   682,   868,  -122,
 +    -121,   876,  2334,   527,   527, -1191,  2334, -1191, -1191, -1191,
 +   -1191, -1191, -1191, -1191,  2334,  4823,  2334,  2334,   709,  2334,
 +    4823,  2334,  2334,   714,  4823,  2334,  2334,  3649,   731,   701,
 +   -1191,  4823,  3297,  3297,  3297,   739,   740,  3297,  3297,  3297,
 +     758, -1191, -1191, -1191, -1191,   763,   791,   797,  3649,  2334,
 +     903,  3649,    17,   746,   789,   101,   101,   101,  2334,  2334,
 +     -63, -1191,    58,   101,   793,   798,   802,  2001,   109,    90,
 +     810,   811,   812,  3297,  3297,  3649,   813,    36,   742, -1191,
 +     886, -1191,   808,   823,   824,  3297,  3297,   771,   830,   833,
 +     577, -1191,   834,    22,  1009,  1013,  1014,   719,  3825,  2334,
 +    2938, -1191, -1191,  2362, -1191,  1016, -1191,   201,  1017,  2334,
 +    2334,  2334,   839,  2334,   840,   895,  2334,  2334, -1191, -1191,
 +    2334,  1026, -1191,  1029, -1191,  1030, -1191,   137,   835, -1191,
 +    3649,  3649,   854,  2334,   859,  1925, -1191, -1191, -1191, -1191,
 +   -1191, -1191,  3649,  1038,   870,  2334,  1056, -1191, -1191,  2334,
 +    2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,
 +    2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,
 +    2334,   527,   527,   527,   527,   527,   527,   527,   527,   527,
 +    2334,  1925,  2334,   527,   527,   527,   832,  1925,   885,   885,
 +     885,  7149,    80,  6804,   265,   882,  1058,   902,   908,   910,
 +     911, -1191,   913,  5356,  2334,  4823, -1191,  2334,  2334,  2334,
 +    2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,  2334,
 +    2334,  2334, -1191, -1191,  2334, -1191, -1191,  1162,   263,   -86,
 +   -1191, -1191,   171,  6131,   290,   378,  7170,  4823,  3777, -1191,
 +     -76,  7191,  7212,  2334,  7233,   -29,  7254,  7275,  2334,    98,
 +    7296,  7317,  1089,  2334,  2334,   139,  1095,  1096,  1097,  2334,
 +    2334,  1098,  1104,  1104,  2334,   927,   935,   936,   941,  2334,
 +    2334,  2334,  1113,  6051,   961,  1137,   963, -1191, -1191,   -16,
 +   -1191, -1191,  6157,  6183,   101,   101,   129,   129,   143,  2334,
 +    2334,  2334,  2001,  2001,  2334,  5356,   152, -1191,  2334,  2334,
 +    2334,  2334,  2334,  1138,  1142,  1143,  2334,  1145, -1191,  2334,
 +    2334,   453, -1191,  4823,  4823,  4823,  1146,  1147,  2334,  2334,
 +    2334,  2334,  1151,    -4,  1153, -1191,  2334, -1191, -1191, -1191,
 +     965,   974,   977,   978,  4823,   885, -1191,  7338, -1191,   202,
 +    2334,  4001, -1191, -1191,  7359,  7380,  7401,  1036,  6209, -1191,
 +     980,  3946,  7422,  6827, -1191, -1191,   787, -1191,  1228,  2334,
 +   -1191,   988,   344,  4823,  6850,  2334,  1161,  1163, -1191,  2334,
 +    6873,    -2,  6781,  6781,  6781,  6781,  6781,  6781,  6781,  6781,
 +    6781,  6781,  6781,  6235,  6781,  6781,  6781,  6781,  6781,  6781,
 +    6781,  6261,  6287,  6313, -1191,   231,   404,   989,   995,   996,
 +     992,   999,  1000,   260,  7863, -1191,  1447,  1001,  1007,  1006,
 +    1012,  1015,    80, -1191,  3649,   134,  1925,  2334,  1172,  1175,
 +      18,  1018, -1191,   102,    12,    19,   148, -1191,  4792,   356,
 +    3965,  2148,  2296,   888,   888,   160,   160,   160,   160,    75,
 +      75,   885,   885,   885,   885,     5,  6896, -1191,  2334,  1190,
 +      31,  4823,  1189,  4823,  2334,  1191, -1191,   832,  1193,   527,
 +    1195,  4823,  4823,  1070,  1196,  1197,  7443,  1206,  1084,  1213,
 +    1214,  7464,  1092,  1217,  1218,  2334,  7485,  5323,  1045, -1191,
 +   -1191, -1191,  7506,  7527,  2334,  3649,  1229,  1233,  7548,  4993,
 +    4993,  4993,  4993,  7569,  7590,  7611,  3649,  4823,  1053, -1191,
 +   -1191,  1616,  1690,   101,  2334,  2334, -1191, -1191,  1059,  1060,
 +    2001,  6339,  6365,  6391,  6105,  1003,   101,  1869,  7632,  5351,
 +    7653,  7674,  7695,  2334,  1240, -1191,  2334,  7716, -1191,  6919,
 +    6942, -1191,   389,   398,   408, -1191, -1191,  6965,  6988,  6417,
 +    7011,   201, -1191, -1191,  4823, -1191,  1067,  5379,  4823,  4823,
 +    4823,  4823,   427, -1191, -1191,  4129,  4823,   885, -1191,  1241,
 +    1242,  1243,  1072,  2334,  2801,  2334,  2334, -1191,    37, -1191,
 +   -1191,  1075,  3649,  1248,   459,   440,  5407, -1191, -1191,  7034,
 +     411, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191,
 +   -1191, -1191, -1191,  2334, -1191, -1191, -1191, -1191, -1191, -1191,
 +   -1191,  2334,  2334,  2334,   527, -1191,  4823, -1191,   527, -1191,
 +   -1191,   527,   527,   527, -1191, -1191, -1191, -1191,  2334, -1191,
 +     527, -1191, -1191,  2334,  1257,    41,  2334,  1259,  1264,  1486,
 +   -1191,  1266,  1099,    17,  1265, -1191,  4823,  4823,  4823,  4823,
 +   -1191,   315,  2334, -1191,  1100,  1106,  1090, -1191,  1269, -1191,
 +   -1191, -1191, -1191, -1191,   201,  7057, -1191, -1191,  1120,   527,
 +     374, -1191,   442,  6443, -1191,  1278, -1191, -1191,   101,  3777,
 +   -1191,   128,  3649,  3649,  1280,  3649,   147,  3649,  3649,  1281,
 +    1230,  3649,  3649,  1551,  1282,  1283,  4823,  1297,  1298,  4317,
 +   -1191, -1191,  1300, -1191,  1303,  1129,  7863, -1191,  1136,  1140,
 +    1141,  1308,  1332,  1334,  1338,   463,  1341,  2985, -1191, -1191,
 +     250,  6469,  6495, -1191, -1191,  5435,   -56,   101,   101,   101,
 +    1342,  1343,  1164,  1348,  1170,    25,    42,    45,    49,   516,
 +   -1191,   289, -1191,  1003,  1349,  1353,  1354,  1355,  1356,  7863,
 +   -1191,  1663,  1171,  1358,  1360,  1363,  1290,  2334,  1366,  1367,
 +    2334,   310,   467, -1191, -1191,   482,   496,   537,   559, -1191,
 +    2334,   572,  3649,  3649,  3649,  1370,  6521, -1191,  4298,   565,
 +    1381,  1383,  3649,  1203, -1191,  1211,  2334,  1384, -1191,  1385,
 +    1389, -1191,  1391,  6781,  6781,  6781,  6781, -1191,   428,   315,
 +    1212,  1221,  1222,   509,   530,  7737,  1224,  1688, -1191,   540,
 +    1223,  1396,  2094, -1191, -1191, -1191,    17,  2334, -1191,   591,
 +   -1191,   599,   620,   623,   627,    80,  7863,  1234,  2334,  2334,
 +    3649,  1226, -1191, -1191,  1236, -1191,  1399,    33,  1413,  2334,
 +    4529,    24,  1239,  1244,  1340,  1340,  3649,  1418,  1245,  1246,
 +    1420,  1425,  3649,  1249,  1426,  1429, -1191,  1432,  3649,   636,
 +    3649,  3649,  1421,  1433, -1191,  3649,  1431,  1434,  1435,  1437,
 +    3649,  3649,  3649, -1191,  1438,   417, -1191,  2334,  2334,  2334,
 +    1262,  1263,   -77,   -66,   -30,  1271, -1191,  3649, -1191,  2334,
 +   -1191,  1442, -1191,  1443, -1191,  1445, -1191,  1446, -1191, -1191,
 +    2001,   733,  3473, -1191,  1272,  1274,  4177, -1191,  4823, -1191,
 +   -1191, -1191,  1275,  2493, -1191, -1191,  7080,  1450,   315, -1191,
 +   -1191, -1191, -1191,  7863, -1191,  1454,  1456,  1337, -1191,  2334,
 +    2334,  2334, -1191,  1458,   544,  1286,  1464,    80,  2512, -1191,
 +   -1191,    64, -1191, -1191, -1191, -1191, -1191, -1191, -1191,   527,
 +   -1191, -1191,  1467, -1191, -1191,  1468, -1191, -1191, -1191, -1191,
 +   -1191,  1925,  2334,  1469,  1470,    18, -1191,  1471,  7103,    17,
 +   -1191,  1473,  1478,  1479,  1480,  3649,  2334,  6547,  6573,   639,
 +   -1191,  2334,  1472, -1191, -1191,   527, -1191,  6599,  4993,  7863,
 +   -1191, -1191,  2334,  2334,   101,  1481,  1482,  1483, -1191,  2334,
 +    2334, -1191, -1191,  1484,  2334, -1191, -1191,  1488,  1491,  1314,
 +    1493,  1371,  2334, -1191,  1494,  3649,  3649,  3649,  3649,  1496,
 +     756,  1497,  2334, -1191,  4993,  5463,  7758,  4491,   129,   129,
 +     101,  1498,   101,  1501,   101,  1502,  2334,    95,  1326,  7779,
 +   -1191, -1191, -1191, -1191,  5491,   300, -1191,  1505,  2761,  1506,
 +    3649,   101,  2761,  1507,   648,  2334, -1191,  1508,   201, -1191,
 +   -1191, -1191,  3649,  4937,   136,  7800, -1191, -1191,  4584,  3649,
 +   -1191,  3649, -1191, -1191,  1339,  3121,  4760,  1515,  2531, -1191,
 +    1520,  1522, -1191,  1357, -1191, -1191, -1191, -1191, -1191,  1523,
 +     454,  7863,  2334,  2334,  3649,  1350,   649,  7863, -1191,  1530,
 +    2334,  7863, -1191,  5519,  5547,   321, -1191, -1191, -1191,  5575,
 +    5603, -1191,  5631,  1532, -1191,  3649, -1191,  1474,  1533,  7863,
 +   -1191,  1535,  1539,  1540,  1541, -1191,  1364, -1191, -1191,  6078,
 +    3066,  1543,  1368, -1191,  2334, -1191,  1373,  1377,   329, -1191,
 +    1379,   347, -1191,  1380,   377, -1191,  1382,  7126,  1545,  3649,
 +    1558,  1386,  2334, -1191,  4353,   381, -1191,   652,   421,   451,
 +   -1191,  1563,  5659, -1191,  1448,  2334, -1191,  2334, -1191, -1191,
 +    4823,  3086,  1565,  1390,  1568, -1191,  2938, -1191, -1191,   527,
 +    7863, -1191, -1191, -1191,    17, -1191,  1449, -1191, -1191,  2334,
 +    6625,  6651, -1191,  3649,  2334,  1570, -1191,  6677, -1191, -1191,
 +    1572,  1573,  1574,  1575,  1577,  1580,   665,  1406, -1191, -1191,
 +   -1191, -1191, -1191,  3649,  4823, -1191, -1191,   129,  5288, -1191,
 +   -1191,  2001,  1003,  2001,  1003,  2001,  1003,  1585, -1191,   678,
 +    3649, -1191,  5687,   101,  1586,  4823,   101, -1191, -1191,  2334,
 +    5715,  5743,   690, -1191, -1191,  1587, -1191,   695,   340,   698,
 +    1588, -1191,  1411,  7863,  2334,  2334,   715,  7863, -1191,  2334,
 +     716,   729, -1191, -1191, -1191, -1191, -1191, -1191,  1412,  2334,
 +     730,   737,  1436,  2334, -1191,  5771,   468,   782,  5799,   486,
 +     934,  5827,   508,  1155, -1191,  3649,  1592,  1537,  3336,  1441,
 +     517, -1191,   741,   536,  3594, -1191, -1191,  1620, -1191,  2334,
 +   -1191,  1925, -1191, -1191,  2334,  7821,  6703,    27,  6729, -1191,
 +   -1191,  2334,  5855,  1621,  1624, -1191,  5883,  1625,  2334,  1627,
 +    1629,  2334,  1630,  1632,  2334,  1633,  1475, -1191,  2334, -1191,
 +    1003, -1191,  4823,  1635,  4353, -1191, -1191,   794, -1191,   744,
 +   -1191,  2334, -1191,  3649,  2334,  6755, -1191, -1191, -1191, -1191,
 +   -1191,  1477,  5911, -1191, -1191,  1487,  5939, -1191, -1191,  1489,
 +    5967, -1191,  1652,  3613,  1270,  3512,   761, -1191,   538,   762,
 +    1925,  1653,  1490,  7842,   766,  5995,  2334,  1003,  1657,  1003,
 +    1659,  1003,  1660, -1191, -1191, -1191, -1191,  1003,  1662,  4823,
 +    1664, -1191, -1191,   527, -1191,  1492,  1666,  6023,  1419, -1191,
 +    1495,  1811, -1191,  1511,  1873, -1191,  1524,  1979, -1191,   786,
 +   -1191,   795, -1191,  1542,  3649, -1191,  1669,  1684,  1003,  1686,
 +    1003,  1698,  1003, -1191,  1700,   527,  1701,   527,   796, -1191,
 +   -1191,  2012, -1191,  2102, -1191,  2192, -1191, -1191, -1191,   800,
 +   -1191,  1717,  1722,  1727,  1728,   527,  1735, -1191, -1191, -1191,
 +   -1191, -1191, -1191
 +=======
 +#define YYPACT_NINF -1266
 +static const yytype_int16 yypact[] =
 +{
 +    6317,    59,    44,  6434, -1266, -1266,  3274,   119,   -55,   -39,
 +     -25,    39,   158,   202,   212,    78,   283,   297,   172,   188,
 +    -148,   197,   221,     2,   240,   243,    14,   250,   253,   315,
 +     372,   378,   456,   270,   342,   406,   416,    22,   445,   246,
 +     329,   102,   360,   460,   -54,   361,   123,   123,   400,   338,
 +      63,    72,   483,   529,    13,    21,   554,   558,   120,   624,
 +     631,   638,  4042,   655,   484,   507,   514,    26,    56, -1266,
 +     524, -1266,   646,   678,   528, -1266,   665,   713,    31,    33,
 +   -1266, -1266, -1266,  6180, -1266, -1266, -1266, -1266, -1266, -1266,
 +   -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266,     5,
 +   -1266,  -126,    90, -1266,    -1, -1266, -1266, -1266, -1266,   -62,
 +     -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,
 +     -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,
 +     -62,   -62,   -62,   -62,   543,   597,   602,   621,   633,   653,
 +     -62,   658, -1266,   -62, -1266, -1266, -1266, -1266,   -62,   -62,
 +     739,   661,   670,   682,   685,   707, -1266, -1266, -1266,  6180,
 +    6180,  6180,  6180,   995,     8,   665,    62,   694,   770,   163,
 +   -1266,   771,   790,  -115,   -34,   889,  6180,   550,   550, -1266,
 +    6180, -1266, -1266, -1266,   550, -1266, -1266, -1266, -1266,  6180,
 +    5953,  6180,  6180,   721,  6180,  5953,  6180,  6180,   734,  5953,
 +    6180,  6180,  4821,   801,   788, -1266,  5953,  4042,  4042,  4042,
 +     816,   819,  4042,  4042,  4042,   826,   827,   850,   851,   852,
 +     853,   854,   856,  4821,  6180,   805,  4821,    26,   855,   857,
 +     123,   123,   123,  6180,  6180,   -77, -1266,   127,   123,   858,
 +     859,   860,  5721,   251,   131,   868,   876,   878,  4042,  4042,
 +    4821,   879,    52,   880, -1266,  1032, -1266,   877,   881,   882,
 +    4042,  4042,   885,   896,   897,   570, -1266,   898,    29,    15,
 +      16,    17,   615,  5001,  6180,  3675, -1266, -1266,  3455, -1266,
 +    1033, -1266,   -11,   166,  1076,  6180,  6180,  6180,   899,  6180,
 +     903,   958,  6180,  6180, -1266, -1266,  6180,   905,   906,  1091,
 +   -1266,  1092, -1266,  1095, -1266,   -98,  1152, -1266,  4821,  4821,
 +   -1266,  6127,   915,   916,  1478, -1266, -1266, -1266, -1266, -1266,
 +   -1266,  4821,  1099,   923,  6180,  1103, -1266,  6180,  6180,  6180,
 +    6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,
 +    6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,   550,
 +     550,   550,   550,   550,   550,  4821,   550,   550,  6180,   550,
 +     550,  6180,  1478,  6180,   550,   550,   550,   665,  1478,   930,
 +     930,   930,  8580,   237,  8235,   229,   926,  1122,   947,   943,
 +   -1266,   945,  4246,  6180,  5953, -1266,  6180,  6180,  6180,  6180,
 +    6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,  6180,
 +    6180, -1266, -1266,  6180, -1266, -1266,  1301,    -5,   352, -1266,
 +   -1266,   369,  3314, -1266,   449,   195,   227,  8601,  5953,  3623,
 +   -1266,   -51,  8622,  8643,  6180,  8664,   272,  8685,  8706,  6180,
 +     319,  8727,  8748,  1125,  6180,  6180,   333,  1130,  1131,  1132,
 +    6180,  6180,  1133,  1135,  1135,  6180,  5779,  5779,  5779,  5779,
 +    6180,  6180,  6180,  1136,  6985,   957,  1138,   959, -1266, -1266,
 +     -88, -1266, -1266,  7065,  7091,   123,   123,    62,    62,   137,
 +    6180,  6180,  6180,  5721,  5721,  6180,  4246,   196, -1266,  6180,
 +    6180,  6180,  6180,  6180,  1139,  1147,  1148,  6180,  1150, -1266,
 +    6180,  6180,  1352, -1266,  5953,  5953,  5953,  1151,  1153,  6180,
 +    6180,  6180,  6180,  1141,   434,   665, -1266,  1104,  6180, -1266,
 +    1111, -1266,  1112, -1266,  1113,    34,    36,    37,    38,  5953,
 +     930, -1266,  8769, -1266,   391,  6180,  5181, -1266,  6180,   488,
 +   -1266,  8790,  8811,  8832,  1034,  7117, -1266,   976,  3642,  8853,
 +    8258, -1266, -1266,  1517, -1266,  1867,  6180, -1266,   986,   452,
 +     237,  8281,  6180,  5953,  1163,  1164, -1266,  6180,  8304,   213,
 +    4128,  4128,  4128,  4128,  4128,  4128,  4128,  4128,  4128,  4128,
 +    4128,  7143,  4128,  4128,  4128,  4128,  4128,  4128,  4128,  7169,
 +    7195,  7221,   106,   395,   106,   990,   991,   988,   993,   998,
 +    1002,  7247,   471,    81,  9294, -1266,  1625,  1003,   996,  1004,
 +    1000,  1013,   237, -1266,  4821,   181,  1478,  6180,  1171,  1193,
 +      27,  1015, -1266,   135,    19,    28,   177, -1266,  4551,   486,
 +    3810,   754,  1333,   769,   769,   565,   565,   565,   565,   540,
 +     540,   930,   930,   930,   930,     6,  8327, -1266,  6180,  1196,
 +      45,  5953,  1198,  5953,  6180,  1199,   550,  1200, -1266,   665,
 +    1201,   550,  1195,  5953,  5953,  1074,  1202,  1205,  8874,  1206,
 +    1080,  1208,  1209,  8895,  1083,  1212,  1213,  6180,  8916,  4610,
 +    1035, -1266, -1266, -1266,  8937,  8958,  6180,  4821,  1218,  1220,
 +    8979,  1045,  9294, -1266,  1047,  9294, -1266,  1048,  9294, -1266,
 +    1050,  9294, -1266,  9000,  9021,  9042,  4821,  5953,  1049, -1266,
 +   -1266,  2020,  2143,   123,  6180,  6180, -1266, -1266,  1051,  1052,
 +    5721,  7273,  7299,  7325,  7039,   366,   123,  2344,  9063,  4766,
 +    9084,  9105,  9126,  6180,  1230, -1266,  6180,  9147, -1266,  8350,
 +    8373, -1266,   534,   560,   578, -1266, -1266,  8396,  8419,  7351,
 +    8442,   166, -1266, -1266,  5953, -1266,  1053,  1054,  4946,  1056,
 +    1057,  1061, -1266,  5953, -1266,  5953, -1266,  5953, -1266,  5953,
 +     581, -1266, -1266,  3831,  5953,   930, -1266,  5953, -1266,  1228,
 +    1231,  1247,  1077,  6180,  2513,  6180,  6180, -1266,    43, -1266,
 +   -1266,  1078,  4821,  1263,  4821,   259,  5126,   584, -1266, -1266,
 +    8465,  1046, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266,
 +   -1266, -1266, -1266, -1266,  6180, -1266, -1266, -1266, -1266, -1266,
 +   -1266, -1266,  6180,  6180,  6180, -1266,  5953, -1266, -1266, -1266,
 +   -1266,   550,  4821,   550,   550,  1478, -1266, -1266, -1266, -1266,
 +   -1266,  6180, -1266,   550, -1266, -1266,  6180,  1265,   130,  6180,
 +    1268,  1269,  1664, -1266,  1271,  1093,    26,  1273, -1266,  5953,
 +    5953,  5953,  5953, -1266,    81,  6180, -1266,  1100,  1101,  1096,
 +   -1266,  1279, -1266, -1266, -1266, -1266, -1266,   166,  8488, -1266,
 +   -1266,  1118,   550,   503, -1266,   517,  7377, -1266, -1266, -1266,
 +    1281, -1266, -1266,   123,  3623, -1266,   700,  4821,  4821,  1282,
 +    4821,   701,  4821,  4821,  1288,  1225,  4821,  4821,  1896,  1296,
 +    1299,  5953,  1302,  1303,  2868, -1266, -1266,  1305, -1266,  1321,
 +     237,   237,   237,   237,  1322,  1326,  1328,  1306,   595,  1298,
 +    2582, -1266, -1266,   273,  7403,  7429, -1266, -1266,  5306,  -109,
 +     123,   123,   123,  1304,  1331,  1175,  1360,  1186,    18,    42,
 +      47,    48,   546, -1266,   300, -1266,   366,  1363,  1368,  1369,
 +    1372,  1373,  9294, -1266,  1953,  1187,  1376,  1377,  1378,  1311,
 +    6180,  1381,  1382,  6180,   285,   600, -1266,  6180, -1266,  6180,
 +    6180,  6180,   603,   604,   608,   612, -1266,  6180,   616,   623,
 +    4821,  4821,  4821,  1385,  7455, -1266,  3999,   953,  1386,  1387,
 +    4821,  1203, -1266,  1388,  6180,  1389, -1266,    81,  1391,  1394,
 +   -1266,  1393,  4128,  4128,  4128,  4128,   423,  1214,  1226,  1227,
 +    1232,  1215,   547,   575,  9168,  1234,  2144, -1266,   290,  1222,
 +    1411,  2277, -1266, -1266, -1266,    26,  6180, -1266,   628, -1266,
 +     635,   636,   639,   640,   237,  9294,  1238,  6180,  6180,  4821,
 +    1242, -1266, -1266,  1250, -1266,  1426,    75,  1432,  6180,  4222,
 +      68,  1254,  1255,  1365,  1365,  4821,  1441,  1264,  1266,  1447,
 +    1451,  4821,  1270,  1454,  1455, -1266,  1457,  4821,   644,  4821,
 +    4821,  1473,  1479, -1266,  4821,  4821,  4821,  4821,  4821,  4821,
 +    4821,  4821, -1266,  1480,   726, -1266,  6180,  6180,  6180,  1300,
 +    1307,  -101,   -46,    84,  1313, -1266,  4821, -1266,  6180, -1266,
 +    1483, -1266,  1484, -1266,  1504, -1266,  1506, -1266, -1266,  5721,
 +     591,  4402, -1266,  1327,  1336,  5361, -1266,  5953, -1266, -1266,
 +   -1266,  1337,  2377, -1266, -1266,  8511,  1482,    81,  7481,  7507,
 +    7533,  7559, -1266, -1266, -1266, -1266,  9294, -1266,    81,  1508,
 +    1521,  1398, -1266,  6180,  6180,  6180, -1266,  1527,   901,  1349,
 +    1531, -1266,  2514, -1266,   237, -1266,   350, -1266, -1266, -1266,
 +   -1266, -1266, -1266,   550, -1266, -1266, -1266,  1478,  1536, -1266,
 +   -1266,  1538, -1266, -1266, -1266, -1266, -1266,  1478,  6180,  1537,
 +    1540,    27, -1266,  1541,  8534,    26, -1266,  1542,  1543,  1545,
 +    1546,  4821,  6180,  7585,  7611,   648, -1266,  6180,  1549, -1266,
 +   -1266,   550, -1266,  7637,  5779,  9294, -1266, -1266,  6180,  6180,
 +     123,  1548,  1550,  1551, -1266,  6180,  6180, -1266, -1266,  1552,
 +    6180, -1266, -1266,  1556,  1557,  1358,  1558,  1421,  6180, -1266,
 +    1560,  1561,  1562,  1563,  1564,  1565,   834,  1566,  6180, -1266,
 +    5779,  5486,  9189,  3228,    62,    62,   123,  1567,   123,  1568,
 +     123,  1570,  6180,   112,  1390,  9210, -1266, -1266, -1266, -1266,
 +    5690,   317, -1266,  1572,  3488,  1573,  4821,   123,  3488,  1575,
 +     663,  6180, -1266,  1576,   166, -1266,  6180,  6180,  6180,  6180,
 +   -1266, -1266, -1266,  4821,  4178,   396,  9231, -1266, -1266,  4582,
 +    4821, -1266, -1266,  4821, -1266,  1401,    81,  3862,  4641,  1578,
 +    2948, -1266,  1588,  1591, -1266,  1413, -1266, -1266, -1266, -1266,
 +   -1266,  1593,   561,  9294,  6180,  6180,  4821,  1412,   668,  9294,
 +   -1266,  1597,  6180,  9294, -1266,  5748,  5898,   775, -1266, -1266,
 +   -1266,  6085,  6425, -1266,  6453,  1602, -1266,  4821, -1266,  1539,
 +    1603,  9294, -1266, -1266, -1266, -1266, -1266, -1266,  1420, -1266,
 +   -1266,  7012,  3006,  1607,  1427, -1266,  6180, -1266,  1425,  1429,
 +     326, -1266,  1428,   340, -1266,  1431,   343, -1266,  1433,  8557,
 +    1614,  4821,  1615,  1435,  6180, -1266,  5541,   346, -1266,   672,
 +     353,   412, -1266,  1618,  6481, -1266,  7663,  7689,  7715,  7741,
 +    1498,  6180, -1266,  6180, -1266, -1266,  5953,  3079,  1623,  1443,
 +    1624, -1266, -1266,  3675, -1266, -1266,   550,  9294, -1266, -1266,
 +   -1266,    26, -1266,  1501, -1266, -1266,  6180,  7767,  7793, -1266,
 +    4821,  6180,  1628, -1266,  7819, -1266, -1266,  1629,  1631,  1633,
 +    1635,  1636,  1640,   675,  1459, -1266,  4821,  5953, -1266, -1266,
 +      62,  4347, -1266, -1266,  5721,   366,  5721,   366,  5721,   366,
 +    1642, -1266,   683,  4821, -1266,  6509,   123,  1643,  5953,   123,
 +   -1266, -1266,  6180,  6180,  6180,  6180,  6180,  6537,  6565,   684,
 +   -1266, -1266,  1646, -1266,   687,  3436,   688,  1647, -1266,  1466,
 +    9294,  6180,  6180,   691,  9294, -1266,  6180,   692,   714, -1266,
 +   -1266, -1266, -1266, -1266, -1266,  1467,  6180,   727,   746,  1468,
 +    6180, -1266,  6593,   415,   795,  6621,   437,  1142,  6649,   440,
 +    1182, -1266,  4821,  1650,  1569,  2789,  1470,   443, -1266,   767,
 +     462,  7845,  7871,  7897,  7923,  3189, -1266, -1266,  1656, -1266,
 +    6180, -1266,  1478, -1266, -1266,  6180,  9252,  7949,    46,  7975,
 +   -1266, -1266,  6180,  6677,  1657,  1574, -1266,  6705,  1661,  6180,
 +    1662,  1663,  6180,  1665,  1666,  6180,  1667,  1485, -1266,  6180,
 +   -1266,   366, -1266,  5953,  1669,  5541,  6180,  6180,  6180,  6180,
 +   -1266, -1266,   800, -1266,   768, -1266,  6180, -1266,  4821,  6180,
 +    8001, -1266, -1266,  4821,  1671, -1266, -1266,  1491,  6733, -1266,
 +   -1266,  1492,  6761, -1266, -1266,  1493,  6789, -1266,  1676,  3209,
 +    1295,  2825,   796, -1266,   473,   799,  8027,  8053,  8079,  8105,
 +    1478,  1677,  1496,  9273,   802,  6817,  6180, -1266, -1266,   366,
 +    1679,   366,  1680,   366,  1681, -1266, -1266, -1266, -1266,   366,
 +    1687,  5953,  1689,  6180,  6180,  6180,  6180, -1266, -1266,   550,
 +   -1266,  1509,  1690,  6845,  2048, -1266,  1510,  2070, -1266,  1512,
 +    2083, -1266,  1514,  2237, -1266,   803, -1266,  8131,  8157,  8183,
 +    8209,   806, -1266,  1515,  4821, -1266,  1701,  1702,   366,  1704,
 +     366,  1705,   366, -1266,  1706,  6180,  6180,  6180,  6180,   550,
 +    1707,   550,   807, -1266, -1266,  2286, -1266,  2420, -1266,  2602,
 +   -1266,  6873,  6901,  6929,  6957, -1266, -1266,   814, -1266,  1708,
 +    1710,  1711,  1716, -1266, -1266, -1266, -1266,   550,  1725, -1266,
 +   -1266, -1266, -1266, -1266, -1266
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        0,     0,     0,     0,     0,   213,   215,     0,     0,     0,
+      177,   179,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   284,     0,   246,
+        0,     0,     0,     0,     0,     0,   308,   317,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   403,     0,
+      468,     0,   447,     0,     0,     0,     0,     0,     0,     0,
+      439,     0,     0,     0,     0,     0,     0,     0,     0,   207,
+        0,     0,     0,     0,   209,     0,     0,   344,     0,     0,
+        0,     0,   509,     0,     0,     0,   412,     0,   411,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,    85,     0,     0,     0,     0,
+       84,    89,    91,     0,     0,   481,     0,    97,     0,     0,
+        0,     0,     0,    75,   366,     0,     0,     0,     0,     0,
+       30,   414,   413,     0,    23,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   146,   146,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   150,     0,     0,
+        0,     0,     0,     0,     0,   312,     0,     0,   134,     0,
+      137,     0,   140,     0,   143,     0,     0,     0,     0,     0,
+        0,     0,   208,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,   290,     0,   289,     0,   295,     0,   297,     0,
+      291,     0,   293,     0,   256,   285,     0,     0,     0,   200,
+        0,     0,     0,   319,     0,   204,   203,   339,     0,     0,
+       31,    32,     0,     0,     0,     0,     0,     0,     0,   456,
+      457,   458,   459,   446,   440,     0,     0,     0,     0,   478,
+        0,     0,     0,   236,     0,     0,     0,     0,     0,    87,
+        0,    86,     0,    76,   219,   416,   218,   377,   385,   386,
+      387,   501,     0,   420,   421,   422,     0,     0,   400,   122,
+        0,   505,   127,   419,   492,    78,    59,     0,     0,     0,
+        0,    77,     0,     0,     0,   479,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   433,     0,     0,    26,    27,
+        0,    28,     0,     0,   111,   114,    72,    73,   148,     0,
+        0,     0,     0,     0,     0,   151,     0,     0,   167,   168,
+        0,     0,   153,   174,     0,     0,     0,     0,   144,     0,
+      311,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,   221,     0,     0,     0,     0,   187,   187,     0,
+      266,     0,   268,     0,   270,     0,   435,     0,     0,   296,
+      298,   292,   294,     0,     0,   250,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   316,     0,   416,   469,     0,
+        0,     0,     0,   470,   156,   157,     0,     0,     0,     0,
+      100,   104,     0,     0,   345,    80,    79,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,    94,     0,     0,    95,
+        0,   482,   189,   190,   191,   192,     0,     0,    40,     0,
+        0,     0,     0,     0,    42,   486,     0,     0,   112,   115,
+        0,     0,   147,   154,   155,   159,     0,     0,   169,     0,
+        0,   313,     0,   162,     0,     0,   302,   173,   149,   161,
+      172,   176,   160,     0,   170,   175,     0,     0,     0,     0,
+        0,     0,   432,     0,   431,     0,     0,     0,   257,     0,
+        0,   258,     0,     0,   259,     0,     0,     0,     0,     0,
+        0,     0,   199,     0,     0,   198,     0,     0,     0,   193,
+        0,     0,    33,     0,     0,     0,     0,     0,     0,   476,
+        0,   238,   237,     0,     0,     0,     0,     0,   497,   499,
+        0,   123,   125,     0,   128,   129,   130,    90,    92,     0,
+       98,     0,    81,    45,     0,     0,     0,   434,     0,     0,
+        0,    29,     0,   121,   126,     0,     0,     0,     0,     0,
+        0,     0,     0,   163,     0,   309,   309,     0,   105,   106,
+      187,     0,   180,   181,     0,     0,     0,     0,     0,     0,
+        0,   286,     0,     0,   187,     0,     0,     0,     0,     0,
+      184,   183,     0,     0,     0,     0,     0,     0,     0,     0,
+      101,   102,     0,    82,     0,   471,     0,     0,   480,     0,
+       41,     0,     0,     0,    43,    58,     0,     0,     0,   327,
+      329,   328,   330,   331,   166,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   430,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   300,     0,
+        0,     0,   251,     0,     0,   194,     0,     0,     0,     0,
+        0,     0,     0,   475,   239,     0,   346,     0,   124,     0,
+      131,    96,     0,     0,     0,     0,     0,   113,   116,     0,
+        0,     0,     0,     0,   310,   320,     0,     0,   321,     0,
+      178,     0,   272,     0,     0,   274,     0,     0,   276,     0,
+        0,     0,   287,     0,   247,     0,   187,     0,     0,     0,
+        0,     0,     0,     0,   158,   103,     0,   119,     0,    49,
+        0,    55,     0,     0,     0,   145,   171,     0,   324,     0,
+      325,   326,   429,   260,     0,     0,   267,   261,     0,     0,
+      269,   262,     0,     0,   271,     0,     0,     0,   253,     0,
+      197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   278,     0,   280,
+        0,   282,   288,   299,   252,   248,     0,     0,     0,     0,
+        0,     0,     0,     0,   120,    46,     0,    53,     0,     0,
+        0,     0,     0,     0,   263,     0,     0,   264,     0,     0,
+      265,     0,     0,   201,     0,   195,     0,     0,     0,     0,
+        0,    47,     0,     0,   228,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   254,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   234,     0,     0,   273,     0,   275,
+        0,   277,     0,   196,     0,     0,     0,     0,    48,    50,
+        0,    51,     0,     0,     0,     0,     0,     0,   460,   461,
+      462,   463,     0,     0,    56,   322,   323,   279,   281,   283,
+       52,    54
  };
  
- /* YYPGOTO[NTERM-NUM].  */
+   /* YYPGOTO[NTERM-NUM].  */
  static const yytype_int16 yypgoto[] =
  {
+    -1312, -1312, -1312, -1312,   845, -1312, -1312, -1312, -1312,   324,
+    -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312,
+    -1312, -1312,  -382,  -100,    11,    -9, -1312,  1502, -1312, -1312,
+    -1312, -1312, -1312,   447, -1312,   448, -1312, -1312, -1312, -1312,
+    -1312, -1312,   846,  1940,    -2,  -479,  -250, -1312, -1312, -1312,
+    -1312, -1312, -1312, -1312,  1941, -1312, -1312, -1312, -1312, -1312,
+    -1312, -1312, -1312, -1312, -1312, -1312, -1312, -1312,  -962,  -922,
+    -1312, -1312,  1480, -1312,   442, -1312, -1312, -1312, -1312,  1517,
+    -1312, -1312,    54, -1312, -1311,  2175,   722,  2052,   777,  -238,
+      707, -1312,    21,    10, -1312,  -360,    -3,    42
++>>>>>>> upstream/2.10.1+dfsg1
+ };
+ 
+   /* YYDEFGOTO[NTERM-NUM].  */
+ static const yytype_int16 yydefgoto[] =
+ {
++<<<<<<< HEAD
 +<<<<<<< HEAD
 +   -1191, -1191, -1191, -1191,   745, -1191, -1191, -1191, -1191,   279,
 +   -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191,
 +   -1191, -1191,  -352,   -72,  4949,  -477, -1191,  1344, -1191, -1191,
 +   -1191, -1191, -1191,   386, -1191,   391, -1191,  -296, -1191,   743,
 +    1742, -1191, -1191, -1191, -1191,     3,  -449,  -235, -1191, -1191,
 +   -1191, -1191, -1191, -1191,  1748, -1191, -1191, -1191, -1191, -1191,
 +   -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191,  -892,  -884,
 +   -1191, -1191,  1319, -1191, -1191, -1191, -1191, -1191,   747, -1191,
 +   -1191,   204, -1191, -1190,  1260,  -109,  1011,   -58,  -204,   641,
 +   -1191,    35,   107, -1191,  -348,    14,    -3
 +=======
 +   -1266, -1266, -1266, -1266,   690, -1266, -1266, -1266, -1266,   198,
 +   -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266,
 +   -1266, -1266,  -338,   -73,  1229,  -460, -1266,  1318, -1266, -1266,
 +   -1266, -1266, -1266,   312, -1266,   313, -1266, -1266, -1266, -1266,
 +   -1266, -1266,   686,  1735,    11,  -459,  -226, -1266, -1266, -1266,
 +   -1266, -1266, -1266,  1739, -1266, -1266, -1266, -1266, -1266, -1266,
 +   -1266, -1266, -1266, -1266, -1266, -1266, -1266,  -942,  -881, -1266,
 +   -1266,  1314, -1266, -1266, -1266, -1266, -1266, -1266,  1529, -1266,
 +   -1266,     0, -1266, -1265,  2159,   287,   997,   101,  -225,   562,
 +   -1266,    20,     7, -1266,  -344,    -3,    76
 +>>>>>>> upstream/2.9.3+dfsg1
 +};
 +
 +/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
 +   positive, shift that token.  If negative, reduce the rule which
 +<<<<<<< HEAD
 +   number is the opposite.  If zero, do what YYDEFACT says.
 +   If YYTABLE_NINF, syntax error.  */
 +#define YYTABLE_NINF -447
 +static const yytype_int16 yytable[] =
 +{
 +     101,   573,   465,   170,   314,   188,    88,   678,   679,   813,
 +     584,  1061,   587,   247,   481,  1059,   188,   100,   446,   193,
 +    1317,   282,   802,   193,   171,   293,   295,   495,   184,   313,
 +    1151,  1050,   175,  1502,     4,   185,   299,   827,   364,  1144,
 +     477,   167,   478,   285,   940,   969,   234,     5,  1052,   235,
 +     239,  1054,   236,   310,   311,  1056,   250,   394,   251,   526,
 +     243,   528,   244,  -444,   304,   752,   753,   754,   755,   756,
 +     757,   758,   759,   760,   761,   762,   172,   764,   765,   766,
 +     767,   768,   769,   770,   317,  1366,   318,   583,   775,   777,
 +     454,   455,   620,   426,   427,   428,   173,   621,   431,   432,
 +     433,   454,   455,   510,   454,   455,  1190,   632,  1191,   633,
 +     240,   454,   455,   168,   241,   207,   252,  1192,   208,  1193,
 +     209,   456,   814,   815,   816,   817,   242,   410,   218,  1041,
 +     174,   219,   415,   370,   473,   474,   419,   454,   455,   255,
 +    1051,   583,   256,   425,  1327,   248,   486,   487,   177,   226,
 +     227,   454,   455,  1194,   632,  1195,   638,  1053,   369,   228,
 +    1055,   365,   366,  1416,  1057,   371,   237,   673,   970,   971,
 +     401,   401,   310,   311,   712,   368,   713,  1059,   189,   315,
 +     714,   316,  -445,  1430,   178,   190,   163,   368,   368,   189,
 +     818,   454,   455,   249,   179,   828,   807,   828,  1002,   194,
 +    1003,   283,   803,   808,   294,   296,   496,   300,   399,   402,
 +     176,  1503,   671,   672,   301,   479,   286,  1008,   941,  1009,
 +      44,    45,    46,    47,   305,   454,   455,   222,    52,   180,
 +     793,    55,   687,   796,   306,   307,   308,   309,   310,   311,
 +     223,   224,   457,   376,   388,   389,   390,   181,  -446,   230,
 +     232,   391,   238,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   511,   389,   390,   468,   226,   227,
 +     182,   391,   586,   302,   469,   303,   454,   455,   228,   184,
 +    1308,   632,   304,   642,   734,   229,   806,   183,   306,   307,
 +     308,   309,   588,   467,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,   310,   311,
 +     454,   455,   391,  1534,   197,   795,   529,   599,   492,   454,
 +     455,  1328,   632,   163,   648,   196,   680,   386,   387,   388,
 +     389,   390,   809,   186,   985,   686,   391,   198,   401,   401,
 +     401,   401,   401,   401,   401,   401,   401,  1461,   510,   622,
 +     401,   401,   401,   580,   623,   368,   368,   368,   368,   368,
 +     368,   368,   368,   368,   868,   869,   870,   368,   368,   368,
 +     368,   306,   307,   308,   309,   310,   311,   566,   567,   568,
 +     569,   570,   571,   572,  1588,   632,   187,   724,   577,   578,
 +     579,   310,   311,   946,   199,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,   712,
 +     191,   713,   536,   391,   774,   398,   104,   454,   455,   306,
 +     307,   308,   309,  1183,  1184,   702,   703,   704,   211,   449,
 +     450,   212,   192,  1037,   213,   877,   214,   458,   784,   310,
 +     311,   466,   618,   774,   619,   195,   722,   583,   196,   163,
 +     130,   131,   132,   133,   134,   135,   454,   455,   575,   371,
 +     371,   200,   139,   140,   581,     7,     8,   454,   455,   751,
 +     625,   201,  1060,   626,   145,   744,  1103,  1104,  1105,  1106,
 +     205,  1107,  1108,  1312,   310,   311,  1113,  1116,   454,   455,
 +    1437,  1077,  1440,   712,  1443,   713,   454,   455,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   631,
 +     389,   390,  1381,   797,   454,   455,   391,   593,    20,    21,
 +     594,    23,    24,   595,    26,   596,    28,   742,    29,   743,
 +    1383,   398,   104,    34,    35,   206,    37,    38,    39,   632,
 +     202,   811,    42,   203,   454,   455,   204,  1121,   454,   455,
 +    1227,  1228,   997,  1059,   148,   149,  1059,   632,   628,  1059,
 +    1385,   626,   210,   830,  1393,   832,   130,   131,   132,   133,
 +     134,   135,   632,  1091,   915,    63,    64,    65,   139,   140,
 +     220,   632,   712,   916,   713,   310,   311,   776,   454,   455,
 +     145,   632,   950,   917,   306,   307,   308,   309,  1524,   978,
 +     221,  1219,   215,   890,  1395,   216,   712,   217,   713,   875,
 +     632,   632,   929,   891,   310,   311,   225,  1122,   454,   455,
 +     998,   892,   893,   894,   835,   632,   401,   895,   896,   897,
 +     898,   233,  1348,  1135,  1396,   454,   455,  1349,   701,   751,
 +    1059,   368,   632,   368,   945,  1558,   632,  1561,  1034,  1564,
 +     632,  1478,  1078,   454,   455,  1567,   922,   245,   676,   677,
 +     925,   926,   927,   928,   837,   632,   450,  1079,   931,  1481,
 +     148,   149,   246,   947,  1059,   454,   455,  1059,   951,   632,
 +    1059,  1080,   253,  1059,   454,   455,  1591,   712,  1593,   713,
 +    1595,  1484,  1112,   798,   306,   307,   308,   309,   254,   279,
 +    1492,  1058,   280,   454,   455,   454,   455,  1059,   712,  1059,
 +     713,  1059,   257,  1115,   310,   311,   258,   259,   958,  1494,
 +     632,  1549,  1081,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,   281,   278,  1296,
 +    1297,   391,   632,  1092,  1082,  1231,   287,   401,   981,   982,
 +     983,   984,   993,   165,   317,   632,   491,  1084,   492,   288,
 +    1286,   162,  1287,   163,   368,   289,   867,   867,   867,   867,
 +     344,   401,  1127,   290,  1129,   401,  1130,   291,   401,   401,
 +     401,   292,   632,   500,  1131,   952,   501,   401,   368,   502,
 +     345,   503,   368,   346,   347,   368,   368,   368,  1019,     7,
 +       8,  1530,   348,   632,   368,  1132,   632,   349,  1133,   957,
 +     632,   352,  1134,   959,   353,   354,   960,   961,   962,   632,
 +     890,  1169,  1254,   355,  1255,   966,   401,   356,   357,   298,
 +     891,   632,  1354,  1321,  1355,  1254,   367,  1394,   892,   893,
 +     894,   530,   374,   368,   895,   896,   897,   898,  1254,   951,
 +    1428,   593,    20,    21,   594,    23,    24,   595,    26,   596,
 +      28,  1445,    29,  1446,   996,   375,   392,    34,    35,   890,
 +      37,    38,    39,   632,   393,  1457,    42,   880,  1459,   891,
 +    1460,   774,   396,  1462,   886,   424,   413,   892,   893,   894,
 +     901,   418,   482,   895,   896,   897,   898,  1123,  1254,  1112,
 +    1467,  1469,   358,   359,   360,   361,   363,   444,   423,    63,
 +      64,    65,  1115,  1254,  1470,  1473,   429,   430,  1206,   397,
 +     632,   480,  1474,   403,   632,  1244,  1493,  1354,  1432,  1531,
 +     447,   406,   408,   411,   412,   434,   414,   408,   416,   417,
 +     439,   408,   420,   421,   632,   632,  1548,  1550,   408,  1254,
 +     488,  1555,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,   443,  1479,   440,   632,
 +     391,  1584,   739,   448,   441,   452,   453,   459,  1585,  1254,
 +    1586,  1601,   460,  1605,   453,  1606,   461,   470,   471,   472,
 +     476,  1409,   483,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,   484,   485,   489,
 +    1214,   391,   490,   494,   497,   505,   507,   408,   498,   499,
 +     517,   890,   512,   513,   519,   520,   514,   515,   516,  1233,
 +     518,   891,   524,   521,   522,   525,   527,   523,   533,   892,
 +     893,   894,  1001,   535,   538,   895,   896,   897,   898,   539,
 +     534,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +     541,   391,   540,   589,   391,   590,   542,   543,   544,   545,
 +     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
 +     556,   557,   558,   559,   560,   561,   562,   563,   163,   591,
 +     890,  1042,  1043,  1044,   304,   162,   645,   574,   592,   576,
 +     891,   649,   650,   651,   659,   654,   401,  1150,   892,   893,
 +     894,   655,   660,   661,   895,   896,   897,   898,   662,  1482,
 +     666,   598,   408,   368,   600,   601,   602,   603,   604,   605,
 +     606,   607,   608,   609,   610,   611,   612,   613,   614,   668,
 +    1410,   616,   401,   669,  1234,   693,  1233,   670,   695,   718,
 +     696,   698,   705,   706,   505,   711,  1448,   716,   719,   368,
 +     636,   720,   721,   732,   735,   641,   741,   747,   617,   748,
 +     646,   647,   778,   779,   780,   781,   652,   653,   800,   801,
 +    1259,   658,   782,   783,   788,   789,   663,   664,   665,   790,
 +     791,   371,   371,   792,   826,   831,   409,   834,   805,   836,
 +     841,   409,   838,   842,   843,   409,   681,   682,   683,   358,
 +     359,   684,   409,   845,   846,   688,   689,   690,   691,   692,
 +     847,   848,   850,   697,   851,   852,   699,   700,  1237,   856,
 +     408,   408,   408,   861,   876,   707,   708,   709,   710,   863,
 +       7,     8,   890,   717,   883,   884,   910,   923,   932,   933,
 +     934,   408,   891,   935,   944,  1262,  1525,   725,   727,   942,
 +     892,   893,   894,   968,  1205,   973,   895,   896,   897,   898,
 +     974,   980,  1402,   976,   990,   992,   710,   988,   977,   506,
 +     408,   409,   746,   989,   995,  1000,   749,  1006,  1012,  1017,
 +    1018,  1291,   593,    20,    21,   594,    23,    24,   595,    26,
 +     596,    28,  1013,    29,  1020,  1021,  1024,  1026,    34,    35,
 +    1025,    37,    38,    39,  1027,  1030,  1431,    42,  1028,  1029,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,   799,  1332,   401,  1452,   391,  1031,
 +    1485,  1032,  1338,  1341,  1033,  1035,  1045,  1049,  1047,  1046,
 +      63,    64,    65,   368,  1048,  1068,  1062,   890,  1265,  1063,
 +    1072,  1064,  1065,  1066,  1069,   825,  1070,   891,   408,  1071,
 +     408,   833,  1074,  1075,  1088,   892,   893,   894,   727,   839,
 +     371,   895,   896,   897,   898,  1093,   409,  1094,  1096,  1097,
 +    1099,  1100,   853,  1101,  1298,  1109,  1301,  1102,  1304,  1110,
 +    1111,   859,  1119,  1125,  1124,  1143,   866,   866,   866,   866,
 +    1141,  1136,  1315,   740,   408,  1318,  1319,  1142,   506,  1146,
 +    1154,   881,   882,  1152,  1158,  1172,  1161,   885,  1153,  1159,
 +    1160,  1162,  1165,  1164,  1526,  1166,  1529,  1167,  1175,  1173,
 +     909,  1176,  1177,   911,  1178,  1182,  1188,  1189,  1200,  1201,
 +    1196,  1202,  1203,   787,  1218,  1545,  1210,   422,  1211,  1215,
 +    1220,   408,  1221,  1222,  1226,   408,   408,   408,   408,  1229,
 +    1230,  1235,  1236,   408,  1240,  1239,  1258,  1242,   442,  1245,
 +     936,   445,   938,   939,  1246,  1247,  1248,  1266,  1267,  1268,
 +    1271,  1569,   975,  1273,   409,   409,   409,  1274,  1275,  1276,
 +    1280,  1277,  1285,  1288,  1299,   475,   890,  1302,  1305,  1309,
 +     953,  1313,  1316,  1320,  1323,   409,   891,  1335,   954,   955,
 +     956,  1342,   728,   408,   892,   893,   894,  1344,  1345,  1347,
 +     895,   896,   897,   898,  1353,   965,  1356,  1365,  1346,  1368,
 +     967,  1369,  1367,   972,   409,  1370,  1371,  1372,  1373,  1376,
 +     401,  1388,  1377,   408,   408,   408,   408,  1016,  1379,   986,
 +     531,   532,  1380,  1382,  1384,  1390,  1386,   368,  1498,  1397,
 +    1391,  1404,   537,  1399,  1406,  1405,  1418,  1411,  1422,  1423,
 +    1424,  1425,   401,  1426,   401,  1436,  1427,  1439,  1572,  1442,
 +    1429,  1444,  1451,  1458,  1463,  1464,  1471,  1450,  1487,   368,
 +    1453,   368,   401,   408,  1577,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,   368,
 +    1597,  1475,  1600,   391,  1488,  1491,  1496,  1507,     7,     8,
 +    1508,  1510,   409,  1513,   409,  1514,  1517,  1551,  1518,  1521,
 +    1611,  1527,   728,   840,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,  1543,  1552,
 +    1522,  1537,   391,  1559,  1073,  1562,  1565,  1076,  1568,  1067,
 +    1570,  1539,  1575,  1541,  1553,  1589,  1574,  1083,   409,  1578,
 +     593,    20,    21,   594,    23,    24,   595,    26,   596,    28,
 +    1590,    29,  1592,  1098,  1120,  1580,    34,    35,  1528,    37,
 +      38,    39,     7,     8,  1594,    42,  1596,  1598,  1582,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,  1607,  1128,   409,  1587,   391,  1608,   409,
 +     409,   409,   409,  1609,  1610,  1137,  1138,   409,    63,    64,
 +      65,  1612,  1145,  1499,  1420,    87,  1147,  1149,  1156,   629,
 +    1421,    95,   657,     0,   593,    20,    21,   594,    23,    24,
 +     595,    26,   596,    28,     0,    29,  1241,     0,     0,     0,
 +      34,    35,     0,    37,    38,    39,     0,     0,     0,    42,
 +       0,     0,     0,     0,  1185,  1186,  1187,   409,     0,     0,
 +       0,     0,     0,     0,  1197,     0,  1199,     0,     0,     0,
 +       0,   878,     0,     0,     0,     0,     0,  1204,     0,     0,
 +       0,     0,    63,    64,    65,   408,     0,   409,   409,   409,
 +     409,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,  1223,  1224,  1225,   391,
 +       0,     0,     0,     0,   794,     0,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,     0,   409,     0,  1238,
 +       0,     0,     0,     0,     0,   879,     0,     0,     0,     0,
 +       0,     7,     8,  1251,     0,     0,     0,     0,  1257,     0,
 +       0,     0,     0,     0,     0,  1261,     0,     0,   890,  1263,
 +    1264,     0,     0,     0,     0,     0,  1269,  1270,   891,     0,
 +       0,  1272,     0,     0,     0,   860,   892,   893,   894,  1279,
 +       0,     0,   895,   896,   897,   898,   874,     0,     0,  1289,
 +     104,  1290,     0,   593,    20,    21,   594,    23,    24,   595,
 +      26,   596,    28,  1307,    29,     0,     0,     0,     0,    34,
 +      35,     0,    37,    38,    39,   408,     0,     0,    42,   408,
 +     890,     0,  1322,     0,   130,   131,   132,   133,   134,   135,
 +     891,     0,     0,     0,     0,  1331,   139,   140,   892,   893,
 +     894,     0,     0,  1340,   895,   896,   897,   898,   145,     0,
 +       0,    63,    64,    65,     0,     0,  1579,     0,     0,  1350,
 +    1351,     0,   943,     0,   102,   297,     0,  1357,     0,     0,
 +     105,   106,   107,     0,     0,   108,   109,   110,   111,   112,
 +     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
 +     123,   124,   125,   126,   127,   128,   129,     0,     0,     0,
 +       0,  1378,     0,     0,     0,     0,   136,   137,   138,     0,
 +       0,     0,     0,     0,   902,   141,   142,   143,  1581,  1392,
 +       0,   505,     0,   144,     0,     0,   890,     0,   148,   149,
 +       0,     0,  1400,     0,  1401,     0,   891,   408,     0,   409,
 +       0,     0,     0,  1408,   892,   893,   894,     0,     0,     0,
 +     895,   896,   897,   898,     0,     0,  1413,     0,     0,   890,
 +    1126,  1417,  1004,  1005,     0,  1007,     0,  1010,  1011,   891,
 +       0,  1014,  1015,     0,     0,     0,     0,   892,   893,   894,
 +       0,   408,     0,   895,   896,   897,   898,     0,  1435,     0,
 +    1438,     0,  1441,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   408,   147,     0,     0,  1454,     0,     0,     0,
 +     150,   151,   152,   153,   154,     0,     0,     0,     0,     0,
 +       0,  1465,  1466,     0,  1583,     0,  1468,     0,   462,   463,
 +       0,     0,     0,   157,     0,     0,  1472,     0,   464,     0,
 +    1476,     0,     0,   161,     0,   229,     0,     0,     0,   890,
 +       0,     0,  1085,  1086,  1087,     0,     0,  1602,     0,   891,
 +       0,     0,  1095,     0,     0,     0,  1497,   892,   893,   894,
 +       0,  1257,     0,   895,   896,   897,   898,     0,  1505,   409,
 +       0,     0,     0,   409,     0,  1512,     0,     0,  1516,     0,
 +       0,  1520,     0,     0,     0,  1523,     0,     0,     0,   408,
 +       0,   408,     0,     0,     0,     0,     0,     0,  1533,     0,
 +    1140,  1535,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,  1157,     0,     0,     0,
 +     391,     0,  1163,     0,     0,     0,     0,     0,  1168,   890,
 +    1170,  1171,     0,  1557,     0,  1174,     0,  1603,     0,   891,
 +    1179,  1180,  1181,     0,     0,     0,   408,   892,   893,   894,
 +       0,     0,     0,   895,   896,   897,   898,  1198,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,  1209,     0,   391,   506,  1213,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   102,   297,     0,
 +       0,   409,     0,   105,   106,   107,     0,   409,   108,   109,
 +     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
 +     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
 +     510,     0,     0,     0,     0,     0,     0,  1604,     0,   136,
 +     137,   138,     0,     0,     0,   409,     0,     0,   141,   142,
 +     143,     0,     0,     0,     0,  1249,   144,   102,   297,     0,
 +       0,     0,     0,   105,   106,   107,   409,     0,   108,   109,
 +     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
 +     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
 +       0,     0,     0,     0,     0,  1281,  1282,  1283,  1284,   136,
 +     137,   138,     0,     0,     0,     0,     0,     0,   141,   142,
 +     143,     0,     0,     0,     0,     0,   144,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +    1140,     0,   391,     0,     0,     0,   147,     0,     0,     0,
 +       0,     0,  1324,   150,   151,   152,   153,   154,     0,  1333,
 +       0,  1334,     0,     0,     0,  1337,     0,     0,     0,  1216,
 +       0,   155,   156,   409,     0,   409,   157,     0,     0,     0,
 +       0,   269,     0,     0,  1352,     0,   161,     0,  1232,     0,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   511,   389,   390,     0,  1140,   147,  1343,   391,     0,
 +       0,     0,     0,   150,   151,   152,   153,   154,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     409,   155,   156,     0,     0,     0,   157,     0,     0,  1389,
 +       0,   269,     0,     0,   362,     0,   161,     0,   102,   103,
 +     104,     0,     0,     0,   105,   106,   107,     0,     0,   108,
 +     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
 +     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
 +     129,     0,     0,  1140,   130,   131,   132,   133,   134,   135,
 +     136,   137,   138,     0,     0,     0,   139,   140,     0,   141,
 +     142,   143,     0,  1140,     0,     0,     0,   144,   145,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1447,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,  1486,     0,   391,     0,     0,
 +       0,   146,     0,     0,     0,     0,     0,   147,   148,   149,
 +       0,     0,     0,     0,   150,   151,   152,   153,   154,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   155,   156,     0,     0,     0,   157,     0,     0,
 +       0,     0,   158,     0,   159,     0,   160,   161,     0,   162,
 +       0,   163,     0,  1140,   102,   260,     0,     0,     0,     0,
 +     105,   106,   107,     0,     0,   108,   109,   110,   111,   112,
 +     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
 +     123,   124,   125,   126,   127,   128,   129,   262,     0,     0,
 +       0,     0,     0,     0,     0,     0,   136,   137,   138,     0,
 +       0,     0,     0,     7,     8,   141,   142,   143,     0,     0,
 +       0,     0,     0,   144,     0,   263,     0,     0,   264,     0,
 +       0,   265,     0,   266,  1140,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   267,     0,     0,     0,     0,
 +       0,     0,    44,    45,    46,    47,    48,     0,     0,     0,
 +      52,     0,     0,    55,     0,   593,    20,    21,   594,    23,
 +      24,   595,    26,   596,    28,     0,    29,     0,     0,     0,
 +       0,    34,    35,     0,    37,    38,    39,     0,     0,     0,
 +      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,   147,     0,     0,     0,     0,     0,     0,
 +     150,   151,   152,   153,   154,     0,     0,     0,     0,     0,
 +       0,     0,     0,    63,    64,    65,     0,     0,   462,  1314,
 +       0,     0,     0,   157,     0,     0,     0,     0,   464,     0,
 +       0,   102,   260,   161,     0,   229,   508,   105,   106,   107,
 +       0,     0,   108,   109,   110,   111,   112,   113,   114,   115,
 +     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
 +     126,   127,   128,   129,   262,     0,     0,     0,     0,     0,
 +       0,     0,     0,   136,   137,   138,   937,     0,     0,     0,
 +       0,     0,   141,   142,   143,     0,     0,     7,     8,     0,
 +     144,     0,   263,     0,     0,   264,     0,     0,   265,     0,
 +     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   267,     0,     0,     0,     0,     0,     0,    44,
 +      45,    46,    47,    48,     0,     0,     0,    52,     0,     0,
 +      55,     0,     0,     0,     0,     0,     0,     0,     0,   593,
 +      20,    21,   594,    23,    24,   595,    26,   596,    28,     0,
 +      29,     0,     0,     0,     0,    34,    35,     0,    37,    38,
 +      39,     0,  1375,     0,    42,     0,     0,     0,     0,     0,
 +     147,     0,     0,     0,     0,     0,     0,   150,   151,   152,
 +     153,   154,  1403,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   155,   407,    63,    64,    65,
 +     157,     0,     0,     0,     0,   269,     0,     0,     0,     0,
 +     161,     0,     0,   508,   102,   260,   104,     0,     0,     0,
 +     105,   106,   107,     0,     0,   108,   109,   110,   111,   112,
 +     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
 +     123,   124,   125,   126,   127,   128,   129,   262,     0,     0,
 +     130,   131,   132,   133,   134,   135,   136,   137,   138,     0,
 +    1036,     0,   139,   140,     0,   141,   142,   143,     0,     0,
 +       0,     0,     0,   144,   145,   263,     0,     0,   264,     0,
 +       0,   265,     0,   266,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   267,     0,     0,     0,     0,
 +       0,     0,    44,    45,    46,    47,    48,     0,     0,     0,
 +      52,     0,     0,    55,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,   147,   148,   149,     0,     0,     0,     0,
 +     150,   151,   152,   153,   154,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   155,   268,
 +       0,     0,     0,   157,     0,     0,     0,     0,   269,     0,
 +     102,   260,   261,   161,     0,  1336,   105,   106,   107,     0,
 +       0,   108,   109,   110,   111,   112,   113,   114,   115,   116,
 +     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
 +     127,   128,   129,   262,     0,     0,     0,     0,     0,     0,
 +       0,     0,   136,   137,   138,     0,     0,     0,     7,     8,
 +       0,   141,   142,   143,     0,     0,     0,     0,     0,   144,
 +       0,   263,     0,     0,   264,     0,     0,   265,     0,   266,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   267,     0,     0,     0,     0,     0,     0,    44,    45,
 +      46,    47,    48,     0,     0,     0,    52,     0,     0,    55,
 +     593,    20,    21,   594,    23,    24,   595,    26,   596,    28,
 +       0,    29,     0,     0,     0,     0,    34,    35,     0,    37,
 +      38,    39,     0,     0,     0,    42,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   147,
 +       0,     0,     0,     0,     0,     0,   150,   151,   152,   153,
 +     154,     0,     0,     0,     0,     0,     0,     0,    63,    64,
 +      65,     0,     0,     0,   155,   268,     0,     0,     0,   157,
 +       0,     0,     0,     0,   269,     0,   102,   260,  1207,   161,
 +       0,   270,   105,   106,   107,     0,     0,   108,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,   262,
 +       0,     0,     0,     0,     0,     0,     0,     0,   136,   137,
 +     138,  1489,     0,     0,     7,     8,     0,   141,   142,   143,
 +       0,     0,     0,     0,     0,   144,     0,   263,     0,     0,
 +     264,     0,     0,   265,     0,   266,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   267,     0,     0,
 +       0,     0,     0,     0,    44,    45,    46,    47,    48,     0,
 +       0,     0,    52,     0,     0,    55,   593,    20,    21,   594,
 +      23,    24,   595,    26,   596,    28,     0,    29,     0,     0,
 +       0,     0,    34,    35,     0,    37,    38,    39,     0,     0,
 +    1495,    42,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   147,     0,     0,     0,  1544,
 +       0,     0,   150,   151,   152,   153,   154,     0,     0,     0,
 +       0,     0,     0,     0,    63,    64,    65,     0,     0,     0,
 +     155,   268,     0,     0,     0,   157,     0,     0,     0,     0,
 +     269,     0,   102,   260,     0,   161,     0,  1208,   105,   106,
 +     107,     0,     0,   108,   109,   110,   111,   112,   113,   114,
 +     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
 +     125,   126,   127,   128,   129,   262,     0,     0,     0,     0,
 +       0,     0,     0,     0,   136,   137,   138,  1546,     0,     0,
 +       0,     0,     0,   141,   142,   143,     0,     0,     0,     0,
 +       0,   144,     0,   263,     0,     0,   264,     0,     0,   265,
 +       0,   266,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,   267,     0,     0,     0,     0,     0,     0,
 +      44,    45,    46,    47,    48,     0,     0,     0,    52,     0,
 +       0,    55,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,   510,     0,     0,     0,   391,
 +       0,   147,     0,     0,     0,     0,     0,     0,   150,   151,
 +     152,   153,   154,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   155,   268,     0,     0,
 +       0,   157,     0,     0,     0,     0,   269,     0,   102,   260,
 +       0,   161,     0,   270,   105,   106,   107,     0,     0,   108,
 +     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
 +     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
 +     129,   262,     0,     0,     0,     0,     0,     0,     0,     0,
 +     136,   137,   138,     0,     0,     0,     0,     0,     0,   141,
 +     142,   143,     0,     0,     0,     0,     0,   144,     0,   263,
 +       0,     0,   264,     0,     0,   265,     0,   266,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   267,
 +       0,     0,     0,     0,     0,     0,    44,    45,    46,    47,
 +      48,     0,     0,     0,    52,     0,     0,    55,     0,     0,
 +       0,     0,     0,     0,     0,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   631,   389,   390,     0,
 +       0,     0,     0,   391,   736,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   147,     0,     0,
 +       0,     0,     0,   812,   150,   151,   152,   153,   154,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,   155,   407,     0,     0,     0,   157,     0,     0,
 +       0,     0,   269,     0,   102,   260,     0,   161,     0,   504,
 +     105,   106,   107,     0,     0,   108,   109,   110,   111,   112,
 +     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
 +     123,   124,   125,   126,   127,   128,   129,   262,     0,     0,
 +       0,     0,     0,     0,     0,     0,   136,   137,   138,     0,
 +       0,     0,     0,     0,     0,   141,   142,   143,     0,     0,
 +       0,     0,     0,   144,     0,   263,     0,     0,   264,     0,
 +       0,   265,     0,   266,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   267,     0,     0,     0,     0,
 +       0,     0,    44,    45,    46,    47,    48,     0,     0,     0,
 +      52,     0,     0,    55,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,   930,     0,     0,
 +       0,   391,     0,   147,     0,     0,     0,     0,     0,     0,
 +     150,   151,   152,   153,   154,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,   155,   407,
 +       0,     0,     0,   157,     0,     0,     0,     0,   269,     0,
 +     102,   260,     0,   161,     0,   726,   105,   106,   107,     0,
 +       0,   108,   109,   110,   111,   112,   113,   114,   115,   116,
 +     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
 +     127,   128,   129,   262,     0,     0,     0,     0,     0,     0,
 +       0,     0,   136,   137,   138,     0,     0,     0,     0,     0,
 +       0,   141,   142,   143,     0,     0,     0,     0,     0,   144,
 +       0,   263,     0,     0,   264,     0,     0,   265,     0,   266,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   267,     0,     0,     0,     0,     0,     0,    44,    45,
 +      46,    47,    48,     0,     0,     0,    52,     0,     0,    55,
 +       0,     0,     0,     0,     0,     0,     0,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,  1090,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,   147,
 +       0,     0,     0,     0,     0,     0,   150,   151,   152,   153,
 +     154,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,   155,   268,     0,     0,     0,   157,
 +       0,     0,     0,     0,   269,     0,   102,   260,     0,   161,
 +       0,  1212,   105,   106,   107,     0,     0,   108,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,   262,
 +       0,     0,     0,     0,     0,     0,     0,     0,   136,   137,
 +     138,     0,     0,     0,  1022,     0,     0,   141,   142,   143,
 +       0,     0,     0,     0,     0,   144,     0,   263,     0,     0,
 +     264,     0,     0,   265,     0,   266,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,   267,     0,     0,
 +       0,     0,     0,     0,    44,    45,    46,    47,    48,     0,
 +       0,     0,    52,     0,     0,    55,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,   147,     0,     0,     0,     0,
 +       0,     0,   150,   151,   152,   153,   154,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     462,  1314,     0,     0,     0,   157,     0,     0,     0,     0,
 +     464,     0,   102,   297,   104,   161,     0,   229,   105,   106,
 +     107,     0,     0,   108,   109,   110,   111,   112,   113,   114,
 +     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
 +     125,   126,   127,   128,   129,     0,     0,     0,   130,   131,
 +     132,   133,   134,   135,   136,   137,   138,     0,     0,     0,
 +     139,   140,     0,   141,   142,   143,     0,   102,   297,   104,
 +       0,   144,   145,   105,   106,   107,     0,     0,   108,   109,
 +     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
 +     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
 +       0,     0,     0,   130,   131,   132,   133,   134,   135,   136,
 +     137,   138,     0,     0,     0,   139,   140,     0,   141,   142,
 +     143,     0,     0,     0,     0,     0,   144,   145,     0,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,   147,   148,   149,  1294,     0,  1295,     0,   150,   151,
 +     152,   153,   154,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   155,   156,     0,     0,
 +       0,   157,     0,     0,     0,     0,   269,     0,     0,     0,
 +       0,   161,     0,  1148,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,   147,   148,   149,     0,
 +       0,     0,     0,   150,   151,   152,   153,   154,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,   155,   156,     0,     0,     0,   157,     0,     0,     0,
 +       0,   269,     0,   102,   297,   104,   161,     0,  1330,   105,
 +     106,   107,     0,     0,   108,   109,   110,   111,   112,   113,
 +     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
 +     124,   125,   126,   127,   128,   129,     0,     0,     0,   130,
 +     131,   132,   133,   134,   135,   136,   137,   138,     0,     0,
 +       0,   139,   140,     0,   141,   142,   143,     0,     0,     0,
 +       0,     0,   144,   145,     0,     0,   102,   260,     0,     0,
 +       0,     0,   105,   106,   107,     0,     0,   108,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,   262,
 +       0,     0,     0,     0,     0,     0,     0,     0,   136,   137,
 +     138,     0,     0,     0,     0,     0,     0,   141,   142,   143,
 +       0,     0,     0,     0,     0,   144,     0,   263,     0,     0,
 +     264,     0,     0,   265,     0,   266,     0,     0,     0,     0,
 +       0,     0,   147,   148,   149,     0,     0,   267,     0,   150,
 +     151,   152,   153,   154,    44,    45,    46,    47,    48,     0,
 +       0,     0,    52,     0,     0,    55,     0,   155,   156,     0,
 +       0,     0,   157,     0,     0,     0,     0,   269,     0,     0,
 +       0,     0,   161,     0,  1339,     0,     0,     0,     0,     0,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,   147,     0,     0,   391,     0,
 +       0,     0,   150,   151,   152,   153,   154,   810,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
 +     155,   407,     0,     0,     0,   157,   102,   297,   104,     0,
 +     269,     0,   105,   106,   107,   161,     0,   108,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,     0,
 +       0,     0,   130,   131,   132,   133,   134,   135,   136,   137,
 +     138,     0,     0,     0,   139,   140,     0,   141,   142,   143,
 +       0,     0,     0,     0,     0,   144,   145,   319,   320,   321,
 +     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
 +     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
 +     342,   343,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,   350,   351,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +    1325,     0,  1326,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,   147,   148,   149,     0,     0,
 +       0,     0,   150,   151,   152,   153,   154,     0,     0,     0,
 +      -4,     1,     0,     0,    -4,     0,     0,     0,     0,     0,
 +     155,   156,    -4,    -4,     0,   157,     0,     0,     0,     0,
 +     269,     0,     0,     0,     0,   161,     0,     0,     0,     0,
 +       0,     0,     0,     0,     0,     0,     0,    -4,    -4,     0,
 +       0,     0,     0,     0,     0,     0,     0,     0,    -4,    -4,
 +      -4,     0,     0,    -4,     0,     0,     0,    -4,    -4,   493,
 +      -4,    -4,     0,     0,    -4,    -4,    -4,    -4,    -4,    -4,
 +      -4,    -4,    -4,    -4,     0,    -4,    -4,    -4,    -4,    -4,
 +      -4,    -4,    -4,    -4,    -4,    -4,    -4,     0,    -4,    -4,
 +      -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,
 +      -4,    -4,    -4,    -4,    -4,     0,     0,     0,    -4,    -4,
 +      -4,     0,     0,     0,     0,     0,    -4,     6,     0,     0,
 +       0,    -4,    -4,    -4,    -4,     7,     8,    -4,     0,    -4,
 +       0,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,
 +      -4,    -4,     0,     0,     0,    -4,    -4,    -4,    -4,     0,
 +       9,    10,     0,     0,     0,     0,     0,     0,     0,     0,
 +       0,    11,    12,    13,     0,     0,    14,     0,     0,     0,
 +      15,    16,     0,    17,    18,     0,     0,    19,    20,    21,
 +      22,    23,    24,    25,    26,    27,    28,     0,    29,    30,
 +      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
 +       0,    41,    42,    43,    44,    45,    46,    47,    48,    49,
 +      50,    51,    52,    53,    54,    55,    56,    57,     7,     8,
 +       0,    58,    59,    60,     0,     0,     0,     0,     0,    61,
 +       0,     0,     0,     0,    62,    63,    64,    65,     0,     0,
 +      66,     0,    67,     0,    68,    69,    70,    71,    72,    73,
 +      74,    75,    76,    77,    78,     0,     0,     0,    79,    80,
 +      81,    82,     0,     0,     0,     0,     0,     0,     0,     0,
 +     593,    20,    21,   594,    23,    24,   595,    26,   596,    28,
 +       0,    29,     0,     0,     0,     0,    34,    35,     0,    37,
 +      38,    39,     0,     0,     0,    42,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,     0,     0,     0,     0,
 +       0,  1433,     0,  1434,     0,     0,     0,     0,    63,    64,
 +      65,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,   855,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,     0,   905,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,     0,     0,   924,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +       0,     0,   948,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1040,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1292,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1311,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1360,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1361,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1362,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1363,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1364,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1398,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1449,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1455,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1456,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1477,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1480,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1483,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1506,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1509,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1538,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1540,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1542,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1556,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1576,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,     0,   667,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,     0,     0,     0,     0,
 +       0,     0,  1374,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,   723,     0,     0,     0,     0,   674,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,   624,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +     674,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,   675,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,   733,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,   763,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,   771,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +     772,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,   773,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,   887,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,   888,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,   889,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +     920,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,   999,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,  1038,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,  1039,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,  1089,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +    1252,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,  1253,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,  1260,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,  1414,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,     0,     0,     0,  1415,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,     0,     0,     0,
 +    1419,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,     0,     0,     0,  1501,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,     0,
 +       0,     0,  1504,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,     0,     0,     0,  1536,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,   712,
 +       0,   713,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,     0,     0,     0,   585,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,   738,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,     0,     0,
 +     745,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,   750,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,     0,     0,   824,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,     0,     0,   913,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,     0,
 +       0,     0,   914,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,     0,     0,   918,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,     0,     0,   919,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,     0,
 +       0,   921,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,     0,     0,     0,   949,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,     0,     0,   994,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,     0,     0,
 +    1217,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,     0,     0,  1243,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,     0,     0,  1387,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,   582,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,   630,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,   634,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,     0,
 +     635,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,   637,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,     0,   639,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,   640,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,   643,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,   644,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,   723,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,   729,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,   730,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,   731,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,     0,
 +     737,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,   844,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,     0,   849,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,   854,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,   857,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,   858,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,   864,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,   871,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,   872,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,   873,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,     0,
 +     904,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391,
 +       0,   906,   377,   378,   379,   380,   381,   382,   383,   384,
 +     385,   386,   387,   388,   389,   390,     0,     0,     0,     0,
 +     391,     0,   907,   377,   378,   379,   380,   381,   382,   383,
 +     384,   385,   386,   387,   388,   389,   390,     0,     0,     0,
 +       0,   391,     0,   908,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,     0,     0,
 +       0,     0,   391,     0,   912,   377,   378,   379,   380,   381,
 +     382,   383,   384,   385,   386,   387,   388,   389,   390,     0,
 +       0,     0,     0,   391,     0,  1118,   377,   378,   379,   380,
 +     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
 +       0,     0,     0,     0,   391,     0,  1293,   377,   378,   379,
 +     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
 +     390,     0,     0,     0,     0,   391,     0,  1310,   377,   378,
 +     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
 +     389,   390,     0,     0,     0,     0,   391,     0,  1329,   377,
 +     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
 +     388,   389,   390,     0,     0,     0,     0,   391,     0,  1500,
 +     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
 +     387,   388,   389,   390,     0,     0,     0,     0,   391,     0,
 +    1554,   377,   378,   379,   380,   381,   382,   383,   384,   385,
 +     386,   387,   388,   389,   390,     0,     0,     0,     0,   391
 +=======
 +   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 +#define YYTABLE_NINF -464
++=======
+       -1,     2,     3,    88,   909,    89,    90,   663,  1377,  1383,
+      898,  1085,  1549,  1750,   899,  1699,  1790,   900,  1752,   901,
+      902,  1089,   336,   423,   176,   402,    91,   678,   434,  1493,
+     1494,   435,  1544,  1060,  1229,  1061,  1232,   712,   715,   718,
+      721,  1405,  1272,   643,   291,   396,   397,    94,    95,    96,
+       97,    98,    99,   100,   292,   990,  1645,  1716,   747,  1429,
+     1432,  1435,  1674,  1678,  1682,  1735,  1738,  1741,   986,   987,
+     1124,   946,   709,   756,  1571,   102,   103,   104,   105,   293,
+      178,   861,   484,   249,  1254,   294,   295,   296,   547,   305,
+      882,  1076,   432,   428,   862,   433,   181,   298
+ };
+ 
+   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+      positive, shift that token.  If negative, reduce the rule whose
+      number is the opposite.  If YYTABLE_NINF, syntax error.  */
++>>>>>>> upstream/2.10.1+dfsg1
  static const yytype_int16 yytable[] =
  {
-      101,  1379,   457,   323,  1110,   582,   193,   584,   708,   709,
-      856,   307,   375,   172,    89,   592,   476,   252,   198,   176,
-      509,   511,   513,   193,  1099,   255,   171,   256,   492,   322,
-      288,   845,   198,   189,   506,   604,   301,   607,   303,   752,
-      190,   754,   756,   758,     5,   179,   235,   237,  1101,   243,
-      988,   870,  1577,  1103,  1105,   310,   488,   311,   489,   282,
-      291,  1108,   465,   466,   312,     4,   379,   244,   403,   768,
-      465,   466,  1433,   298,  1207,   312,   543,   227,   545,   102,
-     1090,  1200,   174,   465,   466,   546,  1246,   503,  1247,   257,
-      228,   229,   167,   212,   465,   466,   213,   314,   214,   703,
-      793,   794,   795,   796,   797,   798,   799,   800,   801,   802,
-      803,   467,   805,   806,   807,   808,   809,   810,   811,   310,
-      525,   326,   815,   817,   818,   465,   466,   857,   858,   859,
-      860,   245,   175,   827,  1018,   246,   654,  1100,   655,   376,
-      377,  1248,   177,  1249,   319,   320,   248,   247,   249,   510,
-      512,   514,   299,   253,  -461,  1483,   178,    45,    46,    47,
-       48,  1102,   298,   507,   181,    53,  1104,  1106,    56,   385,
-      310,  1497,   528,   223,   298,   298,   224,   380,   638,   312,
-      639,   298,   324,   194,   325,   167,   308,   282,   603,   167,
-      195,   260,   282,   309,   261,   861,   282,   408,   411,   282,
-      194,   254,   199,   282,   282,   282,   282,   850,   182,   282,
-      282,   282,   784,   871,   289,   846,   851,   508,   183,   302,
-      282,   304,   753,   282,   755,   757,   759,   180,   989,  1108,
-      460,   461,   701,   702,  1578,   490,   606,   292,   469,   465,
-      466,   378,   477,   871,   603,   282,   282,   282,   315,   316,
-      317,   318,   717,   410,   410,   465,   466,   282,   282,   184,
-      410,  1019,  1020,   742,   836,   743,   603,   839,   319,   320,
-      282,  1250,   282,  1251,   386,   387,   388,   389,   390,   391,
-      392,   393,   394,   395,   396,   526,   398,   399,   742,   185,
-      743,   421,   400,   646,   231,   232,   426,  1177,   465,   466,
-      430,  1370,   608,   186,   233,   282,   282,   436,   465,   466,
-      774,   234,   479,  1614,   216,   468,   189,   217,   282,   480,
-      218,   554,   219,   849,   710,   386,   387,   388,   389,   390,
-      391,   392,   393,   394,   395,   396,   397,   398,   399,   315,
-      316,   317,   318,   400,   319,   320,   298,   298,   298,   298,
-      298,   298,   282,   298,   298,   187,   298,   298,   201,   319,
-      320,   298,   298,   298,   298,   852,   838,   465,   466,   595,
-      583,   188,   585,   586,   587,   601,   589,   590,   191,   647,
-      593,   282,   648,   716,   597,   598,   599,   315,   316,   317,
-      318,   319,   320,   202,  1034,   315,   316,   317,   318,  1682,
-      220,  -462,   192,   221,  1393,   222,   239,   319,   320,   240,
-      207,   650,   241,   208,   648,   282,   209,   315,   316,   317,
-      318,   196,   465,   466,   197,   410,   410,   410,   410,   410,
-      410,   200,   410,   410,   201,   410,   410,   319,   320,   478,
-      410,   410,   410,   600,   465,   466,   203,   994,   315,   316,
-      317,   318,   204,   683,   686,   689,   692,   933,   206,   654,
-     1086,   660,   205,   319,   320,   706,   707,   934,   319,   320,
-     1126,   465,   466,   461,   920,   935,   936,   937,   380,   380,
-      210,   938,   939,   940,   941,   619,   792,  1109,   465,   466,
-      211,   282,   282,   282,   437,   438,   439,   465,   466,   442,
-      443,   444,   298,  1504,  1374,  1507,   654,  1510,   664,   231,
-      232,   465,   466,  1444,   465,   466,   282,   465,   466,   233,
-      654,   215,   670,   282,   465,   466,   242,  1446,   319,   320,
-     1448,   226,   840,  1456,   640,   484,   485,  1154,  -463,   641,
-     1458,   225,  1158,  1159,  1160,  1161,  1162,   497,   498,   230,
-      282,   642,  1169,  1172,   407,   105,   643,   250,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,  1075,  1076,  1077,  1078,   400,   742,   654,   743,
-      762,   746,   816,   465,   466,  1394,   465,   466,   238,   131,
-      132,   133,   134,   135,   136,   732,   733,   734,   140,  1459,
-      251,   282,  1549,   142,   143,   742,   144,   743,   465,   466,
-      654,   465,   466,   841,   465,   466,   742,   149,   743,  1600,
-      760,  1027,   744,  1108,  1552,   258,  1108,  1555,   262,  1108,
-     1563,   645,   259,   465,   466,   263,   646,   933,   282,   782,
-      282,   783,   264,   298,   465,   466,   298,   934,   298,  1565,
-      282,   282,   294,   826,   787,   935,   936,   937,   646,   284,
-     1631,   938,   939,   940,   941,   285,   878,  1275,   792,   297,
-      742,   882,   743,   654,   282,   854,   767,  1644,  1280,  1647,
-     1178,  1650,   933,   515,   295,  1046,   516,  1653,   286,   517,
-      654,   518,   934,   282,   282,   287,  1191,   152,   153,  1047,
-      935,   936,   937,   923,   654,   293,   938,   939,   940,   941,
-      929,   296,   995,   397,   398,   399,   944,   300,  1000,  1108,
-      400,   654,   410,   958,   352,   880,  1685,   410,  1687,   742,
-     1689,   743,  1239,  1240,  1168,  1107,   395,   396,   397,   398,
-      399,   282,   873,  1415,   875,   400,   363,   654,  1416,   959,
-      282,   310,   282,   502,   282,   503,   282,   742,   166,   743,
-      167,   282,  1171,  1108,   282,   654,  1108,   960,   654,  1108,
-      976,   654,  1108,   997,  1051,  1057,  1052,  1058,   353,   282,
-     1262,   282,   654,   354,  1083,  1358,  1359,   654,   298,  1127,
-      654,   654,  1132,  1133,  1042,   654,   402,  1134,   918,   654,
-     1183,  1135,   355,   654,  1108,  1137,  1108,  1610,  1108,   455,
-      654,  1001,  1138,   282,   356,  1185,  1293,  1186,   298,   282,
-      298,   298,   654,   654,  1187,  1188,   654,   654,  1189,  1190,
-      298,   654,  1011,  1225,   357,  1316,  1402,  1317,  1348,   359,
-     1349,  1007,   364,  1009,  1010,   965,   282,   282,   282,   282,
-      654,   365,  1383,  1015,   972,  1421,   973,  1422,   974,  1316,
-      975,  1457,  1316,   366,  1495,   978,   367,   410,   979,   298,
-     1512,   654,  1513,  1528,  1530,   646,  1531,  1533,  1316,  1168,
-     1538,  1540,   383,  1050,   282,   282,   933,   282,   368,   282,
-      282,  1000,  1045,   282,   282,   405,   934,   410,   282,   410,
-      410,  1171,   424,  1541,   935,   936,   937,  1288,  1289,   410,
-      938,   939,   940,   941,  1316,   429,  1544,  1006,   388,   389,
-      390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     1091,  1092,  1093,   654,   400,  1545,   391,   392,   393,   394,
-      395,   396,   397,   398,   399,  1179,   465,   466,   410,   400,
-     1030,  1031,  1032,  1033,   654,  1421,  1564,  1611,   384,   401,
-     1306,  1145,   386,   387,   388,   389,   390,   391,   392,   393,
-      394,   395,   396,   397,   398,   399,   435,   282,   282,   282,
-      400,  1499,   434,   654,  1550,  1630,   654,   282,  1632,  1316,
-      654,  1641,  1674,  1679,  1316,  1680,  1699,   440,   103,   305,
-      441,  1707,  1068,  1708,   106,   107,   108,   445,   446,   109,
-      110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-      130,   447,   448,   449,   450,   451,   282,   452,   493,   527,
-      137,   138,   139,   458,   141,   459,   470,   471,   472,   481,
-      407,   105,   282,   145,   146,   147,  1206,   482,   282,   483,
-      487,   148,  1476,   491,   282,   494,   282,   282,   499,   495,
-      496,   282,   282,   282,   282,   282,   282,   282,   282,   500,
-      501,   505,   530,  1294,   534,   131,   132,   133,   134,   135,
-      136,   536,   537,   282,   140,   167,   312,   541,   542,   142,
-      143,   544,   144,   552,   553,   556,   557,   559,   282,  1261,
-      400,   609,   282,   149,   282,   386,   387,   388,   389,   390,
-      391,   392,   393,   394,   395,   396,   397,   398,   399,   610,
-      611,   166,   667,   400,   612,  1146,   671,   672,   673,   698,
-      676,   151,   677,   696,   699,   741,   723,   700,   154,   155,
-      156,   157,   158,   725,   747,   726,   728,   735,   547,   736,
-      298,   749,   750,   751,   775,   772,   159,   160,   781,   788,
-      789,   161,   819,   820,  1296,   821,   274,   843,   832,   373,
-      822,   165,   834,  1295,  1299,   823,  1477,   420,   282,   824,
-      831,   833,   420,   152,   153,   835,   420,   844,   298,   848,
-      869,  1294,   883,   420,   874,   877,   879,   881,   886,   887,
-     1327,  1324,   888,   890,   891,   892,   893,   895,  1270,   896,
-      897,  1321,   906,   901,   319,   320,   908,   910,  1515,   911,
-      912,   999,   913,   933,   919,   980,   953,   966,   981,   410,
-      926,   927,   967,   934,   969,   970,  1360,  1353,  1363,   971,
-     1366,   935,   936,   937,   982,   380,   380,   938,   939,   940,
-      941,   282,   983,   282,  1377,   282,   990,  1380,  1381,   992,
-      521,  1017,   420,   933,  1022,  1023,  1026,   410,  1025,  1029,
-      282,  1037,  1038,   934,  1039,  1041,  1044,   282,  1049,  1055,
-      282,   935,   936,   937,   282,  1061,  1398,   938,   939,   940,
-      941,  1062,  1084,  1066,  1405,  1408,  1067,   637,  1094,  1069,
-     1070,  1073,  1082,   282,   386,   387,   388,   389,   390,   391,
-      392,   393,   394,   395,   396,   397,   398,   399,  1074,  1079,
-      313,  1553,   400,  1080,   282,  1081,  1601,  1095,   327,   328,
-      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-      349,   350,   351,  1096,     7,     8,  1097,  1098,   282,   358,
-     1111,  1556,   360,   282,  1112,  1117,  1113,   361,   362,  1114,
-     1115,   420,  1118,  1119,  1120,  1121,   933,  1123,  1124,  1142,
-     1147,  1148,  1150,   282,  1151,  1153,   934,  1155,  1156,  1157,
-      282,  1163,  1167,   298,   935,   936,   937,  1180,  1164,  1165,
-      938,   939,   940,   941,  1166,   521,  1175,   282,  1181,  1192,
-      613,    21,    22,   614,    24,    25,   615,    27,   616,    29,
-     1197,    30,  1199,   282,   282,  1198,    35,    36,  1202,    38,
-       39,    40,  1208,  1209,  1503,    43,  1506,  1214,  1509,  1210,
-      282,   380,  1215,  1217,  1216,   282,  1517,  1218,  1220,  1520,
-     1221,  1222,  1223,   386,   387,   388,   389,   390,   391,   392,
-      393,   394,   395,   396,   397,   398,   399,  1228,    64,    65,
-       66,   400,   410,   105,  1627,  1229,  1274,  1238,  1244,  1256,
-     1257,   420,   420,   420,   504,  1245,  1252,  1469,   389,   390,
-      391,   392,   393,   394,   395,   396,   397,   398,   399,   282,
-     1258,   529,  1259,   400,  1281,  1266,   420,   131,   132,   133,
-      134,   135,   136,   766,  1267,  1271,   140,  1282,  1283,     7,
-        8,   142,   143,  1287,   144,   169,  1290,  1291,  1498,  1573,
-     1297,   731,  1298,  1301,  1302,   149,  1337,  1304,  1307,  1308,
-      420,  1309,  1310,  1320,  1328,  1339,  1329,  1330,  1333,  1519,
-      282,  1335,   282,  1336,  1338,  1604,  1342,  1343,  1344,  1345,
-     1346,  1347,  1350,  1361,  1364,   282,  1367,  1371,  1375,  1378,
-      282,  1382,  1385,  1401,  1409,   613,    21,    22,   614,    24,
-       25,   615,    27,   616,    29,  1411,    30,  1412,  1413,  1414,
-     1420,    35,    36,  1423,    38,    39,    40,  1432,  1436,  1435,
-       43,  1434,   306,  1439,  1442,  1440,  1445,  1637,  1443,  1447,
-     1451,  1449,  1453,  1454,  1460,   152,   153,  1466,   282,  1471,
-     1473,   830,  1472,  1478,  1485,  1489,   298,  1490,   420,  1491,
-      420,  1492,  1493,    64,    65,    66,  1494,  1496,  1511,  1518,
-      766,   885,  1529,  1534,  1535,  1542,  1558,  1546,  1562,  1662,
-     1559,   282,  1571,  1582,  1602,  1583,  1605,  1586,  1589,  1590,
-     1024,  1593,  1594,  1597,  1598,  1603,   298,  1618,   298,  1619,
-     1621,  1623,  1625,  1638,  1639,  1645,  1648,  1651,   369,   370,
-      371,   372,   374,  1654,   420,  1656,  1665,  1664,  1668,  1695,
-     1670,  1698,  1672,  1681,   298,   406,   779,  1683,  1684,   412,
-     1686,  1688,  1690,  1696,  1709,   410,  1710,  1711,   417,   419,
-      422,   423,  1712,   425,   419,   427,   428,  1713,   419,   431,
-      432,  1714,  1655,  1574,   651,   419,  1201,  1487,    88,  1488,
-     1212,   420,    96,  1303,     0,     0,     0,     0,     0,     0,
-      420,     0,   420,   454,   420,   410,   420,   410,   679,     0,
-        0,   420,   463,   464,   420,     0,     0,     0,     0,     0,
-        0,   464,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   410,     0,     0,     0,   386,   387,   388,
-      389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-      399,     0,   520,   522,   419,   400,     0,     0,     0,     0,
-        0,     0,     0,   420,   531,   532,   533,     0,   535,     0,
-        0,   538,   539,     0,     0,   540,   386,   387,   388,   389,
-      390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-      551,     0,     0,     0,   400,     0,   420,   420,   420,   420,
-        0,     0,     0,   558,     0,     0,   560,   561,   562,   563,
-      564,   565,   566,   567,   568,   569,   570,   571,   572,   573,
-      574,   575,   576,   577,   578,   579,   580,   581,     0,     7,
-        8,     0,     0,     0,     0,     0,     0,   591,     0,     0,
-      594,     0,   596,     0,     0,     0,     0,     0,   420,     0,
-        0,     0,  1065,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   618,   419,     0,   620,   621,   622,   623,   624,
-      625,   626,   627,   628,   629,   630,   631,   632,   633,   634,
-        0,     0,   636,     0,     0,   613,    21,    22,   614,    24,
-       25,   615,    27,   616,    29,     0,    30,   520,     0,     0,
-        0,    35,    36,   658,    38,    39,    40,     0,   663,  1116,
-       43,     0,     0,   668,   669,     0,     0,     0,     0,   674,
-      675,     0,     0,     0,   680,   682,   685,   688,   691,   693,
-      694,   695,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,    64,    65,    66,     0,     0,     0,   711,
-      712,   713,   369,   370,   714,     0,     0,     0,   718,   719,
-      720,   721,   722,     0,     0,     0,   727,     0,     0,   729,
-      730,     0,     0,   419,   419,   419,     0,     0,   737,   738,
-      739,   740,     7,     8,     0,     0,     0,   748,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,   419,     0,
-        0,     0,     0,     0,   763,   765,   780,   636,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,   740,   400,     0,     0,     0,
-        0,   786,   419,     0,     0,     0,   790,     0,   613,    21,
-       22,   614,    24,    25,   615,    27,   616,    29,     0,    30,
-        0,     0,     0,     0,    35,    36,     0,    38,    39,    40,
-        0,     0,     0,    43,   420,   386,   387,   388,   389,   390,
-      391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
-        0,     0,     0,   400,     0,     0,   842,     0,     0,   933,
-        0,     0,     0,     0,     0,     0,    64,    65,    66,   934,
-     1176,     0,     0,     0,     0,     7,     8,   935,   936,   937,
-        0,   933,     0,   938,   939,   940,   941,   868,     0,     0,
-      419,   934,   419,   876,   933,     0,     0,     0,     0,   935,
-      936,   937,   765,   884,   934,   938,   939,   940,   941,     0,
-        0,     0,   935,   936,   937,     0,   898,     0,   938,   939,
-      940,   941,     0,     0,     0,   904,     0,     0,     0,   921,
-        0,   613,    21,    22,   614,    24,    25,   615,    27,   616,
-       29,     0,    30,     0,     0,     0,   419,    35,    36,     0,
-       38,    39,    40,   924,   925,     0,    43,  1667,     0,   928,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   952,     0,     0,   954,     0,     0,     0,  1669,
-        0,   420,     0,     0,     0,   420,     0,     0,     0,    64,
-       65,    66,  1671,   419,     0,     0,     0,     0,     0,     0,
-        0,     0,   419,  1182,   419,     0,   419,     0,   419,     0,
-        0,     0,     0,   419,     0,     0,   419,     0,     0,     0,
-        0,     0,   984,     0,   986,   987,   386,   387,   388,   389,
-      390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-        0,     0,     0,     0,   400,     0,     0,     0,   933,     0,
-        0,     0,   922,  1002,     0,     0,     0,     0,   934,     0,
-        0,  1003,  1004,  1005,     0,   419,   935,   936,   937,     0,
-        0,     0,   938,   939,   940,   941,     7,     8,     0,     0,
-     1014,   433,     0,     0,     0,  1016,     0,     0,  1021,     0,
-        0,     0,     0,   521,     0,     0,     0,   933,   419,   419,
-      419,   419,   453,  1272,  1035,   456,     0,   934,     0,     0,
-        0,     0,     0,   420,     0,   935,   936,   937,     0,     0,
-      420,   938,   939,   940,   941,     0,     0,     0,     0,   486,
-        0,     0,   613,    21,    22,   614,    24,    25,   615,    27,
-      616,    29,     0,    30,     0,     0,  1673,     0,    35,    36,
-      419,    38,    39,    40,   420,     0,     0,    43,     0,   386,
-      387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-      397,   398,   399,     0,     0,   420,     0,   400,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   548,   549,     0,
-       64,    65,    66,     0,     0,  1700,     0,     0,     0,     0,
-      555,     0,     0,     0,     0,     0,     0,     0,     0,  1122,
-        0,     0,  1125,     0,     0,     0,  1128,     0,  1129,  1130,
-     1131,     0,     0,     0,     0,     0,  1136,     0,     0,     0,
-        0,   933,     0,     0,   588,     0,     0,     0,     0,     0,
-     1292,   934,     0,  1152,     0,     7,     8,     0,     0,   935,
-      936,   937,     0,   945,     0,   938,   939,   940,   941,   386,
-      387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-      397,   398,   399,     0,     0,  1184,     0,   400,     0,     0,
-      420,     0,   420,     0,     0,     0,  1193,  1194,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,  1203,  1205,     0,
-        0,   613,    21,    22,   614,    24,    25,   615,    27,   616,
-       29,     0,    30,     0,     7,     8,     0,    35,    36,     0,
-       38,    39,    40,     0,     0,     0,    43,     0,     0,  1701,
-        0,     0,     0,     0,     0,  1241,  1242,  1243,     0,     0,
-        0,     0,     0,     0,     0,  1253,     0,  1255,   420,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,  1260,    64,
-       65,    66,     0,     0,     0,     0,   419,     0,     0,     0,
-      613,    21,    22,   614,    24,    25,   615,    27,   616,    29,
-        0,    30,     0,     0,     0,     0,    35,    36,     0,    38,
-       39,    40,  1284,  1285,  1286,    43,   386,   387,   388,   389,
-      390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-        0,     0,     0,   933,   400,     0,     0,     0,     0,     0,
-        0,     0,   985,   934,     0,     0,     0,  1300,    64,    65,
-       66,   935,   936,   937,     0,     0,     0,   938,   939,   940,
-      941,  1313,     0,     0,     0,     0,  1319,     0,     0,     0,
-        0,     0,     0,  1323,     0,     0,     0,  1325,  1326,     0,
-        0,     0,     0,     0,  1331,  1332,     0,     0,     0,  1334,
-        0,     0,     0,     0,     0,     0,     0,  1341,     0,     0,
-        0,     0,     0,   837,     0,     0,     0,  1351,     0,  1352,
-        0,  1085,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,  1369,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,  1702,     0,   419,     0,     0,     0,   419,     0,     0,
-     1384,     7,     8,     0,     0,  1386,  1387,  1388,  1389,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,  1397,     0,
-        0,     0,     0,     0,     0,     0,     0,  1407,     0,     0,
-        0,     0,     0,     0,     0,     0,   905,     7,     8,     0,
-        0,     0,     0,  1417,  1418,     0,     0,     0,     0,     0,
-        0,  1424,     0,     0,     0,   917,     0,   613,    21,    22,
-      614,    24,    25,   615,    27,   616,    29,     0,    30,     0,
-        0,     0,     0,    35,    36,     0,    38,    39,    40,     0,
-        0,     0,    43,     0,     0,  1441,     0,     0,     0,     0,
-        0,     0,     0,   613,    21,    22,   614,    24,    25,   615,
-       27,   616,    29,  1455,    30,   520,     0,     0,     0,    35,
-       36,     0,    38,    39,    40,    64,    65,    66,    43,     0,
-     1467,     0,  1468,     0,     0,   419,     0,     0,     0,     0,
-        0,     0,  1475,     0,     0,     0,     0,     0,     0,     0,
-        0,   991,     0,   993,     0,  1480,     0,     0,     0,     0,
-     1484,    64,    65,    66,  1410,     0,     0,     0,     0,  1071,
-        0,     0,     0,     0,     0,     0,   419,     0,     0,     0,
-        0,     0,     0,  1502,     0,  1505,     0,  1508,  1560,     0,
-        0,  1008,     0,     0,     0,     0,     0,   419,     0,     0,
-        0,  1521,  1522,  1523,  1524,  1525,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     1536,  1537,  1438,     0,  1628,  1539,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,  1543,     0,     0,     0,  1547,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,  1053,  1054,   400,  1056,
-        0,  1059,  1060,     0,     0,  1063,  1064,     0,     0,  1572,
-        0,     0,     0,     0,  1319,     0,     0,     0,     0,     0,
-        0,  1580,     0,     0,     0,     0,     0,     0,  1588,     0,
-        0,  1592,     0,     0,  1596,  1470,     0,     0,  1599,     0,
-        0,     0,   419,     0,   419,  1606,  1607,  1608,  1609,     0,
-        0,     0,     0,     0,     0,  1613,     0,     0,  1615,     0,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,  1139,
-     1140,  1141,     0,     0,     0,  1643,     0,     0,     0,  1149,
+      106,    93,   479,   206,   609,   498,   611,   337,   633,   510,
+      740,   741,   265,  1032,   619,   907,   180,   513,  1446,   211,
+      647,   303,   390,   306,  1362,   183,   257,   179,  1167,   206,
+      187,   202,   200,   201,   880,  1661,   184,   211,   203,   892,
+     1156,   532,   529,   315,   534,   107,   536,   220,   182,   317,
+      221,   782,   338,   222,   268,  1158,   784,   487,   488,     4,
+      786,   788,   297,  1160,  1165,   669,   567,  1259,   569,  1162,
+      670,   322,   325,  1309,   326,  1310,   268,   487,   488,   334,
+      335,   327,  1268,   270,   198,   271,   199,   487,   488,  1668,
+     -484,  1501,  1670,  1311,   258,  1312,   487,   488,   259,   269,
+      185,   244,   245,   248,   250,  1147,   256,   487,   488,   646,
+      260,   246,  1313,   501,  1314,   334,   335,   328,   247,     5,
+      502,   313,   329,  1183,   489,   342,   343,   344,   345,   346,
+      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
+      357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
+      667,   272,   668,   266,   391,   392,   373,   175,  1157,   375,
+      202,   893,   894,   895,   896,   376,   377,   884,  1363,   186,
+      268,   382,   395,  1159,  1066,   533,   530,  1553,   535,   189,
+      537,  1161,   268,   268,   214,   193,   908,  1163,   207,   190,
+      268,   887,   421,  1567,   422,   208,   511,   819,   268,  1033,
+      297,   327,   191,   175,   267,   297,   427,   430,   307,   297,
+      436,   212,   297,   304,   207,   393,   297,   297,   297,   297,
+      188,   885,   297,   297,   297,  1662,   881,   429,   429,   886,
+      733,   734,   897,   531,   316,   429,   297,   339,   908,   340,
+      318,   341,   783,   437,   192,  1165,   175,   785,   871,   874,
+      749,   787,   789,   194,   323,   487,   488,   195,   297,   297,
+      297,   324,   487,   488,   196,   487,   488,   646,   330,   331,
+      332,   333,   297,   297,   204,   334,   335,   487,   488,   487,
+      488,   330,   331,   332,   333,   297,  -485,   297,   487,   488,
+      634,   527,   426,   110,   490,   548,   500,   482,   483,   240,
+      334,   335,   487,   488,   735,   491,  1067,  1068,   553,   499,
+      804,   236,   241,   242,   237,   334,   335,   197,   742,   579,
+      297,   297,   811,   205,   487,   488,  -486,   136,   137,   138,
+      139,   140,   141,   297,   487,   488,   145,  1460,   209,   580,
+      748,   147,   148,   149,   487,   488,   150,   551,   210,   552,
+     1143,  1701,   334,   335,   487,   488,   327,   155,   487,   488,
+     1166,   268,   268,   268,   268,   268,   268,   297,   268,   268,
+     1441,   268,   268,   632,  1514,   213,   268,   268,   268,   268,
+      268,   487,   488,   487,   488,   215,   610,   622,   612,   613,
+      614,   216,   616,   617,   629,   214,   620,  1516,   297,  1518,
+      624,   625,   626,   627,   637,   217,   429,   429,   429,   429,
+      429,   429,   252,   429,   429,   253,   429,   429,   254,   487,
+      488,   429,   429,   429,   429,   628,   330,   331,   332,   333,
+      218,   487,   488,  1038,  1040,  1526,   297,   219,   487,   488,
+      158,   159,  1773,   223,   646,   334,   335,  1528,  1236,   415,
+      416,   417,   166,   873,  1529,   224,   418,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   549,   416,
+      417,   297,   297,   334,   335,   418,   228,   714,   717,   720,
+      723,  1047,   964,   548,  1437,   238,   825,   395,   395,   413,
+      414,   415,   416,   417,   275,  1302,  1303,   276,   418,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,   297,   297,   297,   243,   418,   775,   244,
+      245,   487,   488,  1351,  1352,   268,  1461,   487,   488,   246,
+      872,   875,   330,   331,   332,   333,   255,  1633,   239,   297,
+      671,   738,   739,  1636,   798,   672,   297,   487,   488,   483,
+      251,   334,   335,  1581,   261,  1584,   262,  1587,   487,   488,
+      487,   488,   399,  1639,   400,  1202,   263,  1127,   401,  1129,
+      776,  1131,   674,  1133,  1647,   297,  1649,   675,   826,   827,
+      828,   829,   830,   831,   832,   833,   834,   835,   836,   264,
+      838,   839,   840,   841,   842,   843,   844,   685,   273,   686,
+      848,   850,   851,   330,   331,   332,   333,   330,   331,   332,
+      333,   860,   859,   977,   394,   487,   488,   675,   868,   487,
+      488,   274,   334,   335,   978,   866,   334,   335,   883,   277,
+      867,  1704,   979,   980,   981,  1705,   487,   488,   982,   983,
+      984,   985,   876,  1075,   297,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   549,   416,   417,  1165,
+      487,   488,  1165,   418,   685,  1165,   691,   297,   278,   297,
+      487,   488,   268,   825,   279,   268,  1718,   268,   487,   488,
+      299,   297,   297,  1687,  1237,   399,  1756,   400,   309,   339,
+      675,   570,   921,   526,  1757,   524,   915,   525,   175,   526,
+     1250,   919,   174,   676,   175,   297,   677,  1568,  1569,    48,
+       49,    50,    51,  1570,  1096,  1039,  1041,   429,    56,   685,
+      917,    59,   429,  1046,  1048,   300,   297,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   685,   977,   695,  1733,   418,  1736,  1203,  1739,   229,
+     1572,  1573,   230,   978,  1742,   231,  1570,   232,   399,   301,
+      400,   979,   980,   981,   578,  1165,   302,   982,   983,   984,
+      985,   297,   399,   538,   400,   685,   539,   701,   774,   540,
+      297,   541,   297,   685,   297,   792,   297,   225,   403,   967,
+      226,   297,   227,   308,   297,   233,   973,  1778,   234,  1780,
+      235,  1782,   988,  1091,  1092,   679,   310,   399,   677,   400,
+      297,  1165,   977,   797,  1165,   311,   297,  1165,   312,   314,
+     1165,   268,   399,   978,   400,   367,   368,   849,  1425,  1426,
+     1357,   979,   980,   981,   369,  1242,  1097,   982,   983,   984,
+      985,   685,  1483,   571,  1164,  1049,   297,  1484,   813,   370,
+      814,   268,   297,   268,   268,   371,  1165,   399,  1165,   400,
+     1165,   399,   685,   400,   268,   399,   429,   400,  1059,   399,
+     1227,   400,   372,   374,  1230,  1055,   378,  1057,  1058,   420,
+     1082,   297,   297,   297,   297,   685,   379,   889,  1063,   685,
+      685,   960,   961,   685,   424,  1002,   429,   380,   429,   429,
+      685,   685,  1003,  1004,   381,   685,   268,  1020,  1048,   429,
+      383,  1100,  1101,   685,  1325,  1043,  1103,  1109,  1104,  1110,
+      685,   384,  1140,   297,   297,   685,   297,  1184,   297,   297,
+     1095,   398,   297,   297,   685,   445,  1189,   297,   685,   685,
+     1190,  1191,   458,   459,   460,   419,   450,   463,   464,   465,
+      455,   429,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,  1238,   685,   461,  1192,
+      418,   666,  1413,   685,  1414,  1194,  1102,   456,   462,   685,
+      442,  1195,   466,   506,   507,   447,  1244,   467,  1245,   451,
+      685,   685,  1246,  1247,   512,   468,   457,   519,   520,   685,
+      685,  1248,  1249,   685,   477,  1286,  1371,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   297,   297,   297,  1381,   418,  1382,   474,  1148,  1149,
+     1150,  1576,   297,   469,  1212,   685,  1489,  1450,  1490,   470,
+      327,  1217,  1218,  1219,  1220,  1221,   685,   471,  1505,   108,
+      319,  1228,  1231,   472,   473,   111,   112,   113,   480,   481,
+      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+      124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+      134,   135,   685,   514,  1506,   297,  1381,  1381,  1527,  1565,
+      492,   142,   143,   144,  1589,   146,  1590,   685,  1607,  1605,
+     1608,   675,   503,  1610,   297,   493,   151,   152,   153,  1265,
+      297,   494,   504,  1546,   154,  1358,   297,   505,   297,   297,
+     1381,   509,  1615,   297,   297,  1227,   297,  1617,   297,  1230,
+      297,  1618,   297,   297,   297,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,  1381,
+      297,  1621,   685,   418,  1629,   685,  1489,  1648,  1698,   685,
+      515,  1717,   685,   977,  1719,   297,  1609,   548,  1381,   297,
+     1728,   297,   516,   517,   978,  1338,   518,   685,   645,  1765,
+      521,   550,   979,   980,   981,  1770,  1343,  1771,   982,   983,
+      984,   985,  1381,  1802,  1792,  1803,   522,   157,   523,   528,
+      160,   554,   558,   561,   175,   161,   162,   163,   164,   165,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,   268,
+     1324,   560,   565,   418,   566,   167,   168,   568,   577,   582,
+      169,   583,   586,   418,   635,   289,  1360,  1358,   636,   174,
+      173,  1547,   475,  1359,   638,   681,  1364,   297,   682,   698,
+      977,   727,   728,   702,   703,   704,   730,   268,   707,   708,
+      297,   978,   731,   732,   429,  1634,   755,   757,   760,   979,
+      980,   981,   758,  1389,  1592,   982,   983,   984,   985,   767,
+      768,  1386,   773,   777,   779,   780,   781,   802,   805,   977,
+      812,   820,   821,   764,   765,   766,   297,   297,   852,   853,
+      978,   854,   429,   865,   869,   395,   395,   855,   979,   980,
+      981,   856,   857,  1420,   982,   983,   984,   985,   864,   790,
+      870,   878,   879,   863,   297,  1392,   297,   906,   297,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      684,   416,   417,   297,     7,     8,   911,   418,   914,   977,
+      297,  1469,  1637,   916,   297,   818,   918,   940,   297,   922,
+      978,   925,  1465,  1427,   926,  1430,   927,  1433,   979,   980,
+      981,  1472,  1475,  1476,   982,   983,   984,   985,   297,   929,
+      930,  1444,   931,   932,  1447,  1448,   935,   936,   945,   934,
+      949,  1640,   947,   950,   951,   953,  1688,   952,   954,   297,
+      955,   956,   963,   997,   639,    24,    25,   640,    27,    28,
+      641,    30,   642,    32,   970,    33,   971,   977,  1010,  1024,
+       38,    39,  1025,    41,    42,    43,  1011,  1026,   978,    46,
+     1037,  1065,  1027,  1013,  1014,   297,   979,   980,   981,  1015,
+      297,  1035,   982,   983,   984,   985,  1070,   910,  1071,   912,
+     1073,  1714,  1077,  1083,  1074,  1086,  1087,  1090,  1094,  1099,
+      297,  1107,  1113,    67,    68,    69,  1072,   297,  1088,  1114,
+      268,  1118,  1119,     7,     8,  1121,  1122,  1125,  1153,  1126,
+     1135,  1136,  1137,  1138,  1139,   297,  1141,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   297,  1151,  1152,   297,   418,   962,  1154,   395,  1155,
+     1168,  1169,  1174,  1170,  1171,   429,  1172,  1175,  1176,  1758,
+      297,  1177,  1178,   177,  1180,   297,  1181,  1199,  1204,   763,
+     1205,  1207,  1215,   639,    24,    25,   640,    27,    28,   641,
+       30,   642,    32,  1209,    33,  1211,  1213,  1214,  1216,    38,
+       39,  1009,    41,    42,    43,  1222,  1223,  1224,    46,  1225,
+     1016,  1234,  1017,  1226,  1018,  1240,  1019,   297,  1580,  1256,
+     1583,  1022,  1586,  1258,  1023,  1239,  1251,  1261,  1257,  1266,
+     1594,  1267,  1271,  1597,  1269,  1275,   297,   977,  1270,  1276,
+     1277,  1278,    67,    68,    69,  1279,  1281,  1282,   978,  1283,
+     1284,  1289,  1290,   320,   321,  1299,   979,   980,   981,  1300,
+     1117,  1319,   982,   983,   984,   985,  1301,  1307,  1308,  1657,
+     1315,  1320,  1321,  1623,  1322,  1337,  1054,  1627,  1329,  1330,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,   297,  1334,   297,  1344,   418,  1345,
+     1350,  1346,  1353,  1354,  1361,  1366,  1367,  1369,   809,   297,
+     1372,  1078,  1079,  1080,  1081,  1373,  1374,  1375,  1385,  1393,
+     1400,   977,  1394,  1395,  1398,  1401,  1667,  1402,  1403,  1407,
+     1669,  1408,   978,  1404,   385,   386,   387,   388,   389,  1760,
+      979,   980,   981,  1409,  1410,  1411,   982,   983,   984,   985,
+     1412,   425,  1415,  1691,  1428,   431,  1431,  1724,  1434,  1438,
+     1442,  1445,  1449,  1452,  1477,   297,  1479,  1120,  1480,   438,
+      440,   443,   444,   268,   446,   440,   448,   449,  1468,   440,
+      452,   453,  1173,  1482,  1491,  1500,   440,  1503,  1481,  1488,
+     1509,  1521,  1504,  1510,  1523,  1512,  1502,  1751,  1513,  1515,
+      297,  1517,  1519,  1524,   476,  1530,  1536,  1541,  1731,  1732,
+     1542,  1543,  1548,   485,   486,  1555,  1559,   268,   429,   268,
+     1560,  1561,   486,  1762,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,  1562,  1563,
+     1564,  1788,   418,  1791,  1566,  1588,  1595,  1606,  1611,   268,
+     1625,  1628,  1612,  1619,  1622,   543,   545,   440,  1626,  1642,
+     1630,   977,   429,  1643,   429,  1646,  1655,   555,   556,   557,
+     1666,   559,   978,  1810,   562,   563,  1671,  1673,   564,  1676,
+      979,   980,   981,  1677,  1680,  1681,   982,   983,   984,   985,
+     1684,  1690,   575,   576,   429,  1685,  1712,  1725,  1734,  1706,
+     1737,  1708,  1710,  1726,  1740,  1743,   584,   585,  1745,   587,
+      588,   589,   590,   591,   592,   593,   594,   595,   596,   597,
+      598,   599,   600,   601,   602,   603,   604,   605,   606,   607,
+      608,  1753,  1754,  1774,  1777,  1779,  1759,  1761,  1763,  1772,
+      618,  1781,  1783,   621,  1789,   623,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     1804,  1805,  1806,  1764,   418,   644,  1807,  1808,   440,  1809,
+     1811,   648,   649,   650,   651,   652,   653,   654,   655,   656,
+      657,   658,   659,   660,   661,   662,  1658,   680,   664,   665,
+     1557,  1260,  1558,    92,   101,   710,     0,  1368,  1574,   977,
+        0,  1333,  1273,     0,     0,     0,   543,     0,     0,     0,
+      978,     0,   689,     0,     0,     0,     0,   694,   979,   980,
+      981,     0,   699,   700,   982,   983,   984,   985,   705,   706,
+        0,     0,     0,   711,   713,   716,   719,   722,   724,   725,
+      726,   440,   440,     0,     0,     0,     0,     0,     0,     0,
+        0,  1235,     0,     0,     0,     0,     0,     0,     0,   743,
+      744,   745,   385,   386,   746,     0,     0,     0,   750,   751,
+      752,   753,   754,     0,     0,     0,   759,     0,   761,   762,
+        0,     0,     0,   440,   440,   440,     0,     0,   769,   770,
+      771,   584,   772,     7,     8,     0,     0,     0,   778,     0,
+        0,  1795,     0,     0,     0,     0,     0,     0,     0,   440,
+        0,     0,     0,     0,     0,   793,   795,     0,   664,   665,
+        0,     0,     7,     8,     0,     0,  1416,  1417,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   772,     0,     0,
+        0,     0,     0,     0,   817,   440,     0,     0,     0,     0,
+      822,     0,     0,   639,    24,    25,   640,    27,    28,   641,
+       30,   642,    32,     0,    33,     0,     0,     0,     0,    38,
+       39,     0,    41,    42,    43,     0,     0,     0,    46,     0,
+        0,     0,   639,    24,    25,   640,    27,    28,   641,    30,
+      642,    32,     0,    33,     0,     0,     0,     0,    38,    39,
+      877,    41,    42,    43,     0,     0,     0,    46,     0,     0,
+        0,  1241,    67,    68,    69,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,   905,   977,     0,   440,     0,   440,
+      913,    67,    68,    69,     0,     0,   978,     0,   920,   110,
+        0,   795,   923,  1335,   979,   980,   981,     0,     0,     0,
+      982,   983,   984,   985,     0,   937,     0,     0,     0,     0,
+        0,     0,     0,     0,   943,     0,     0,     0,   810,     0,
+        0,     0,     0,   136,   137,   138,   139,   140,   141,     0,
+     1539,     0,   145,     0,     0,     0,   440,   147,   148,   149,
+        0,     0,   150,   968,   969,   441,     0,   965,     0,   972,
+      441,     0,     0,   155,   441,     0,     0,     0,     0,     0,
+        0,   441,   996,     0,     0,   998,     0,     0,     0,     0,
+        0,     0,     0,     0,  1575,     0,     0,  1796,     0,     0,
+        0,   440,     0,     0,     0,     0,     0,     0,     0,     0,
+      440,     0,   440,     0,   440,  1596,   440,     0,     0,     0,
+     1355,   440,     0,     0,   440,     0,     0,     0,     0,     0,
+     1028,     0,  1030,  1031,     0,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+      544,     0,   441,   418,     0,     0,   158,   159,     0,     0,
+        0,     0,     0,     0,  1050,     0,     0,     0,   166,     0,
+        0,     0,  1051,  1052,  1053,     0,   440,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,  1062,     0,     0,     0,   418,     0,     0,  1064,     0,
+      454,  1069,     0,   426,   110,     0,     0,     0,     0,     0,
+        0,   440,   440,   440,   440,     0,     0,  1356,  1084,     0,
+        0,     0,     0,     0,   478,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,  1689,     0,  1692,     0,   136,   137,
+      138,   139,   140,   141,     0,   977,     0,   145,   508,     0,
+        0,     0,   147,   148,   149,     0,   978,   150,     0,     0,
+        0,     0,     0,   441,   979,   980,   981,   440,   155,     0,
+      982,   983,   984,   985,     0,     0,     0,  1128,     0,  1130,
+        0,  1132,     0,  1134,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,   544,   418,     0,     0,  1744,     0,     0,   573,   574,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   581,     0,     0,     0,   418,     0,     0,     0,     0,
+        0,  1179,     0,     0,  1182,     0,   441,   441,  1185,  1478,
+     1186,  1187,  1188,     0,     0,     0,     0,  1797,  1193,     0,
+        0,   158,   159,     0,     0,   615,     0,     0,     0,     0,
+        0,     0,     0,   166,     0,  1208,     0,  1210,     7,     8,
+        0,     0,     0,     0,     0,     0,     0,     0,   441,   441,
+      441,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,  1243,     0,     0,   441,     0,     0,     0,     0,     0,
+        0,   796,     0,  1252,  1253,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,  1262,  1264,     0,   639,    24,
+       25,   640,    27,    28,   641,    30,   642,    32,     0,    33,
+      441,     0,     0,     0,    38,    39,     0,    41,    42,    43,
+        0,     0,     0,    46,     0,     0,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     1304,  1305,  1306,     0,   418,     0,     0,     0,     0,     0,
+     1316,  1423,  1318,  1424,     0,     0,     0,    67,    68,    69,
+        0,     0,     0,  1323,     7,     8,     0,     0,     0,     0,
+        0,   440,     0,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,     0,     0,     0,     0,  1347,  1348,  1349,
+        0,     0,   441,     0,   441,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   796,   924,     0,     0,
+        0,  1508,     0,   966,   639,    24,    25,   640,    27,    28,
+      641,    30,   642,    32,  1365,    33,     0,     0,     0,     0,
+       38,    39,     0,    41,    42,    43,     0,     0,  1378,    46,
+        0,     0,     0,  1384,     0,     0,     0,  1540,     0,     0,
+        0,   441,     0,     0,     0,     0,  1390,  1391,     0,     0,
+        0,     0,     0,  1396,  1397,     0,     0,  1654,  1399,     0,
+        0,     0,     0,    67,    68,    69,  1406,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   440,   440,  1418,     0,
+     1419,     0,   890,     0,     0,     0,   441,     0,     0,     0,
+        0,     0,  1436,     0,     0,   441,     0,   441,     0,   441,
+        0,   441,     0,  1713,   440,     0,   441,     0,   440,   441,
+        0,  1451,     0,     0,     0,     0,  1453,  1454,  1455,  1456,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,  1464,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,  1474,
+        0,     0,     0,   944,     0,     0,     0,     0,     0,     0,
+        0,  1697,     0,     0,     0,     0,  1485,  1486,     0,     0,
+        0,   441,     0,     0,  1492,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   441,   441,   441,   441,
+     1511,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,  1525,   418,
+      543,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,  1537,     0,  1538,     0,   418,
+      440,     0,     0,     0,     0,     0,     0,  1545,  1036,     0,
+        0,     0,   441,     0,  1044,     0,     0,     0,     0,     0,
+        0,  1550,     0,     0,     0,     0,  1554,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,     0,   548,     0,   440,   418,     0,     0,     0,     0,
+     1056,  1579,     0,  1582,     0,  1585,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   440,     0,     0,     0,  1598,
+     1599,  1600,  1601,  1602,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,  1613,  1614,
+        0,     0,   418,  1616,     0,     0,     0,     0,     0,   806,
+        0,     0,     0,  1620,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,  1631,     0,     0,     0,     0,     0,
+        0,  1105,  1106,     0,  1108,     0,  1111,  1112,     0,     0,
+     1115,  1116,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,  1656,     0,     0,     0,   418,  1384,
+        0,     0,     0,     0,     0,     0,  1664,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      419,     0,  1657,  1658,  1659,  1660,     0,     0,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,  1570,     0,     0,  1196,     0,
-        0,     0,     0,     0,  1691,  1692,  1693,  1694,     0,     0,
-        0,     0,     0,     0,  1213,  1626,     0,     0,     0,     0,
-     1219,     0,     0,     0,     0,     0,  1224,     0,  1226,  1227,
-        0,     0,     0,  1230,  1231,  1232,  1233,  1234,  1235,  1236,
-     1237,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-      395,   396,   397,   398,   399,  1254,     0,     0,     0,   400,
+     1675,   891,     0,  1679,     0,     0,  1683,     0,     0,     0,
+     1686,     0,     0,     0,   440,     0,   440,  1693,  1694,  1695,
+     1696,     0,     0,     0,     0,     0,     0,  1700,     0,     0,
+     1702,     0,     0,     0,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   684,   416,   417,  1021,  1196,
+     1197,  1198,   418,     0,     0,     0,     0,     0,     0,     0,
+     1206,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     1730,     0,  1201,     0,     0,     0,   441,     0,     0,     0,
+        0,     0,     0,     0,     0,   440,     0,  1746,  1747,  1748,
+     1749,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,     0,     0,  1255,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,  1775,  1776,     0,     0,     0,     0,     0,
+        0,     0,  1274,  1784,  1785,  1786,  1787,     0,  1280,     0,
+        0,     0,     0,     0,  1285,     0,  1287,  1288,     0,     0,
+        0,  1291,  1292,     0,  1293,     0,  1294,     0,  1295,     0,
+     1296,  1297,  1298,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,  1317,  1123,
+        0,   418,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,  1328,     0,     0,     0,  1332,     0,     0,
+        0,   441,   441,     0,     0,     0,     0,     0,     0,     0,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,   441,
+        0,     0,     0,   441,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,  1376,     0,     0,     0,     0,
+        0,     0,     0,   108,   109,   110,     0,     0,  1388,   111,
+      112,   113,     0,     0,   114,   115,   116,   117,   118,   119,
+      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+      130,   131,   132,   133,   134,   135,     0,     0,     0,   136,
+      137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+        0,     7,     8,   147,   148,   149,     0,     0,   150,     0,
+      151,   152,   153,     0,     0,   544,     0,     0,   154,   155,
+        0,     0,     0,     0,  1255,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   441,     0,     0,     0,     0,
+        0,  1457,   441,     0,     0,     0,     0,     0,  1466,     0,
+        0,     0,  1467,     0,     0,     0,  1471,     0,     0,     0,
+        0,   639,    24,    25,   640,    27,    28,   641,    30,   642,
+       32,     0,    33,     0,     0,     0,  1487,    38,    39,   441,
+       41,    42,    43,     0,     0,     0,    46,     0,     0,     0,
+        0,     0,     0,     0,     0,   156,     0,  1255,     0,     0,
+      441,   157,   158,   159,   160,     0,     0,     0,     0,   161,
+      162,   163,   164,   165,   166,     0,     0,     0,     0,     0,
+       67,    68,    69,     0,     0,     0,     0,     0,     0,   167,
+      168,     0,     0,  1522,   169,     0,     0,     0,     0,   170,
+        0,   171,     0,   172,   173,     0,   174,     0,   175,     0,
+      108,   319,     0,     0,     0,     0,   111,   112,   113,     0,
+        0,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+      123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+      133,   134,   135,  1255,     0,     0,   989,     0,     0,     0,
+        0,     0,   142,   143,   144,     0,   146,     0,     0,  1255,
+        0,     0,     0,     0,     0,     0,     0,   151,   152,   153,
+        0,     0,     0,     0,     0,   154,   108,   280,  1591,   441,
+        0,   441,   111,   112,   113,     0,     0,   114,   115,   116,
+      117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      127,   128,   129,   130,   131,   132,   133,   134,   135,   282,
+        0,     0,     0,     0,     0,     0,     0,     0,   142,   143,
+      144,     0,   146,     0,     0,  1624,     0,     0,     0,     0,
+        0,     0,     0,   151,   152,   153,     0,     0,     0,     0,
+        0,   154,     0,     0,  1641,   283,     0,     0,   284,     0,
+      441,   285,     0,   286,     0,     0,     0,     0,   157,     0,
+        0,   160,     0,     0,     0,   287,   161,   162,   163,   164,
+      165,     0,    48,    49,    50,    51,    52,     0,     0,     0,
+        0,    56,     0,     0,    59,     0,   495,   496,     0,     0,
+        0,   169,     0,     0,     0,     0,   497,     0,     0,     0,
+        0,   173,     0,   247,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,  1255,     0,     0,
+        0,     0,     0,     0,   157,     0,     0,   160,     0,     0,
+        0,     0,   161,   162,   163,   164,   165,     0,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,   495,  1443,     0,     0,   418,   169,     0,     0,
+        0,     0,   497,  1458,     0,  1459,     0,   173,     0,   247,
+      546,   108,   280,     0,     0,     0,     0,   111,   112,   113,
+        0,     0,   114,   115,   116,   117,   118,   119,   120,   121,
+      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      132,   133,   134,   135,   282,     0,     0,     0,  1255,     0,
+        0,     0,     0,   142,   143,   144,     0,   146,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   151,   152,
+      153,     0,     0,     0,     0,     0,   154,     0,     0,     0,
+      283,     0,     0,   284,     0,     0,   285,     0,   286,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     1265,     0,     0,     0,  1269,     0,     0,   103,   104,   105,
-        0,     0,     0,   106,   107,   108,     0,     0,   109,   110,
-      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-      121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-        0,     0,     0,   131,   132,   133,   134,   135,   136,   137,
-      138,   139,   140,   141,     0,     0,     0,   142,   143,     0,
-      144,     0,   145,   146,   147,     0,     0,     0,     0,     0,
-      148,   149,     0,     0,     0,     0,     0,     0,     0,     0,
-     1311,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-      395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
-        0,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-      395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
-        0,     0,     0,     0,   150,  1356,     0,  1357,     0,     0,
-      151,   152,   153,     0,     0,  1196,     0,   154,   155,   156,
-      157,   158,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,  1390,  1532,   525,   159,   160,     0,     0,  1399,
-      161,     0,  1400,     0,     0,   162,  1404,   163,     0,   164,
-      165,     0,   166,   525,   167,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,  1419,   386,   387,   388,   389,
-      390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-        0,   103,   265,     0,   400,     0,  1196,   106,   107,   108,
-        0,   644,   109,   110,   111,   112,   113,   114,   115,   116,
+      287,     0,     0,     0,     0,     0,     0,    48,    49,    50,
+       51,    52,     0,     0,     0,     0,    56,     0,     0,    59,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1577,     0,  1578,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,   157,
+        0,     0,   160,     0,     0,     0,     0,   161,   162,   163,
+      164,   165,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,   167,   439,     0,
+      418,     0,   169,     0,     0,     0,     0,   289,     0,   888,
+        0,     0,   173,     0,     0,   546,   108,   280,   110,     0,
+        0,     0,   111,   112,   113,     0,     0,   114,   115,   116,
       117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-      127,   128,   129,   130,   267,     0,     0,     0,     0,     0,
-     1452,     0,     0,   137,   138,   139,     0,   141,     0,     0,
-        0,     0,     0,     0,     0,     0,   145,   146,   147,     0,
-        0,     0,     0,     0,   148,     0,   268,     0,     0,   269,
-        0,     0,   270,     0,   271,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,   272,     0,     0,  1196,
-        0,     0,     0,    45,    46,    47,    48,    49,     0,     0,
-        0,    53,     0,     0,    56,  1196,     0,     0,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   653,
-      398,   399,  1514,     0,     0,     0,   400,   386,   387,   388,
-      389,   390,   391,   392,   393,   394,   395,   396,   526,   398,
-      399,   525,     0,     0,   151,   400,     0,     0,     0,     0,
-        0,   154,   155,   156,   157,   158,     0,     0,     0,     0,
-      776,     0,     0,     0,     0,     0,     0,     0,     0,   473,
-     1376,     0,     0,     0,   161,     0,     0,     0,     0,   475,
-        0,  1557,     0,     0,   165,     0,   234,   523,   103,   265,
-        0,     0,     0,     0,   106,   107,   108,     0,     0,   109,
-      110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+      127,   128,   129,   130,   131,   132,   133,   134,   135,   282,
+        0,     0,   136,   137,   138,   139,   140,   141,   142,   143,
+      144,   145,   146,     0,     0,     0,   147,   148,   149,     0,
+        0,   150,     0,   151,   152,   153,     0,     0,     0,     0,
+        0,   154,   155,     0,     0,   283,     0,     0,   284,     0,
+        0,   285,     0,   286,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   287,     0,     0,     0,     0,
+        0,     0,    48,    49,    50,    51,    52,     0,     0,     0,
+        0,    56,     0,     0,    59,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,     0,     0,     0,     0,     0,
+        0,     0,   939,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   157,   158,   159,   160,     0,     0,
+        0,     0,   161,   162,   163,   164,   165,   166,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,   167,   288,     0,     0,   418,   169,   791,     0,
+        0,     0,   289,   736,   108,   280,   110,   173,     0,   290,
+      111,   112,   113,     0,     0,   114,   115,   116,   117,   118,
+      119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+      129,   130,   131,   132,   133,   134,   135,   282,     0,     0,
+      136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+      146,     0,     0,     0,   147,   148,   149,     0,     0,   150,
+        0,   151,   152,   153,     0,     0,     0,     0,     0,   154,
+      155,     0,     0,   283,     0,     0,   284,     0,     0,   285,
+        0,   286,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,   287,     0,     0,     0,     0,     0,     0,
+       48,    49,    50,    51,    52,     0,     0,     0,     0,    56,
+        0,     0,    59,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,     0,     0,     0,     0,     0,     0,     0,
+      992,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,   157,   158,   159,   160,     0,     0,     0,     0,
+      161,   162,   163,   164,   165,   166,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+      167,   288,     0,     0,   418,   169,     0,     0,     0,     0,
+      289,   673,   108,   319,   110,   173,     0,  1470,   111,   112,
+      113,     0,     0,   114,   115,   116,   117,   118,   119,   120,
+      121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+      131,   132,   133,   134,   135,     0,     0,     0,   136,   137,
+      138,   139,   140,   141,   142,   143,   144,   145,   146,     0,
+        0,     0,   147,   148,   149,     0,     0,   150,     0,   151,
+      152,   153,     0,   108,   319,   110,     0,   154,   155,   111,
+      112,   113,     0,     0,   114,   115,   116,   117,   118,   119,
       120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-      130,   267,     0,     0,     0,     0,     0,     0,     0,     0,
-      137,   138,   139,     0,   141,     0,     0,     0,     0,     0,
-        0,     0,     0,   145,   146,   147,     0,  1196,     0,     0,
-        0,   148,  1617,   268,     0,     0,   269,     0,     0,   270,
-        0,   271,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   272,     0,     0,     0,     0,     0,     0,
-       45,    46,    47,    48,    49,     0,     0,     0,    53,     0,
-        0,    56,     0,     0,     0,   386,   387,   388,   389,   390,
-      391,   392,   393,   394,   395,   396,   653,   398,   399,     0,
-        0,     0,     0,   400,   386,   387,   388,   389,   390,   391,
-      392,   393,   394,   395,   396,   397,   398,   399,   855,     0,
-        0,   151,   400,  1196,     0,     0,     0,     0,   154,   155,
-      156,   157,   158,     0,     0,     0,     0,     0,     0,   977,
-        0,     0,     0,     0,     0,     0,   159,   418,     0,     0,
-        0,   161,     0,     0,     0,     0,   274,     0,     0,     0,
-        0,   165,     0,     0,   523,   103,   265,   105,     0,     0,
-        0,   106,   107,   108,     0,     0,   109,   110,   111,   112,
-      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      123,   124,   125,   126,   127,   128,   129,   130,   267,     0,
-        0,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      140,   141,     0,     0,     0,   142,   143,     0,   144,     0,
-      145,   146,   147,     0,     0,     0,     0,     0,   148,   149,
-      268,     0,     0,   269,     0,     0,   270,     0,   271,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      272,     0,     0,     0,     0,     0,     0,    45,    46,    47,
-       48,    49,     0,     0,     0,    53,     0,     0,    56,     0,
-        0,     0,   386,   387,   388,   389,   390,   391,   392,   393,
-      394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
-      400,     0,     0,   386,   387,   388,   389,   390,   391,   392,
-      393,   394,   395,   396,   397,   398,   399,  1144,   151,   152,
-      153,   400,     0,     0,     0,   154,   155,   156,   157,   158,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   159,   273,     0,     0,     0,   161,     0,
-        0,     0,     0,   274,     0,   103,   265,   266,   165,     0,
-     1403,   106,   107,   108,     0,     0,   109,   110,   111,   112,
-      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      123,   124,   125,   126,   127,   128,   129,   130,   267,     0,
-        0,     0,     0,     0,     0,     0,     0,   137,   138,   139,
-        0,   141,     0,     0,     0,     0,     0,     0,     0,     0,
-      145,   146,   147,     0,     0,     0,     0,     0,   148,     0,
-      268,     0,     0,   269,     0,     0,   270,     0,   271,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      272,     0,     0,     0,     0,     0,     0,    45,    46,    47,
-       48,    49,     0,     0,     0,    53,     0,     0,    56,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-      395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
-        0,     0,     0,     0,     0,     0,     0,     0,   151,     0,
-        0,     0,     0,     0,     0,   154,   155,   156,   157,   158,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   159,   273,     0,     0,     0,   161,     0,
-        0,     0,     0,   274,     0,   103,   305,   105,   165,     0,
-      275,   106,   107,   108,     0,     0,   109,   110,   111,   112,
-      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      123,   124,   125,   126,   127,   128,   129,   130,     7,     8,
-        0,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      140,   141,     0,     0,     0,   142,   143,     0,   144,     0,
-      145,   146,   147,     0,     0,     0,     0,     0,   148,   149,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
-      742,     0,   743,     0,   613,    21,    22,   614,    24,    25,
-      615,    27,   616,    29,     0,    30,     0,     0,     0,     0,
-       35,    36,     0,    38,    39,    40,     0,     0,     0,    43,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
-        0,     0,     0,     0,     0,  1391,     0,  1392,   151,   152,
-      153,     0,    64,    65,    66,   154,   155,   156,   157,   158,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   159,   160,     0,     0,     0,   161,     0,
-        0,     0,     0,   274,     0,   103,   265,  1263,   165,     0,
-     1204,   106,   107,   108,     0,     0,   109,   110,   111,   112,
-      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      123,   124,   125,   126,   127,   128,   129,   130,   267,     0,
-        0,     0,     0,     0,     0,     0,     0,   137,   138,   139,
-        0,   141,     0,     0,     0,     0,     0,     0,     0,     0,
-      145,   146,   147,     0,     0,     0,     0,     0,   148,     0,
-      268,     0,     0,   269,     0,     0,   270,     0,   271,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      272,     0,     0,     0,     0,     0,     0,    45,    46,    47,
-       48,    49,     0,     0,     0,    53,     0,     0,    56,   386,
-      387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-      397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
-        0,     0,     0,     0,  1500,     0,  1501,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,   151,     0,
-        0,     0,     0,     0,     0,   154,   155,   156,   157,   158,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   159,   273,     0,     0,     0,   161,     0,
-        0,     0,     0,   274,     0,   103,   305,   105,   165,     0,
-     1264,   106,   107,   108,     0,     0,   109,   110,   111,   112,
-      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      123,   124,   125,   126,   127,   128,   129,   130,     0,     0,
-        0,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-      140,   141,     0,     0,     0,   142,   143,     0,   144,     0,
-      145,   146,   147,     0,   103,   305,   105,     0,   148,   149,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
-      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,     0,     0,     0,
-      131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-      141,     0,     0,     0,   142,   143,     0,   144,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,   149,     0,
-        0,     0,     0,   386,   387,   388,   389,   390,   391,   392,
-      393,   394,   395,   396,   397,   398,   399,     0,   151,   152,
-      153,   400,     0,     0,     0,   154,   155,   156,   157,   158,
-      853,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,   159,   160,     0,     0,     0,   161,     0,
-        0,     0,     0,   274,     0,     0,     0,     0,   165,     0,
-     1396,     0,   386,   387,   388,   389,   390,   391,   392,   393,
-      394,   395,   396,   397,   398,   399,     0,   151,   152,   153,
-      400,     0,     0,     0,   154,   155,   156,   157,   158,   900,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   159,   160,     0,     0,     0,   161,     0,     0,
-        0,     0,   274,     0,   103,   265,     0,   165,     0,  1406,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
+      130,   131,   132,   133,   134,   135,     0,     0,     0,   136,
+      137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+        0,     0,     0,   147,   148,   149,     0,     0,   150,     0,
+      151,   152,   153,     0,     0,     0,     0,     0,   154,   155,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+      157,   158,   159,   160,     0,     0,     0,  1012,   161,   162,
+      163,   164,   165,   166,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,   167,   168,
+        0,     0,   418,   169,     0,     0,     0,     0,   289,     0,
+        0,  1042,     0,   173,     0,  1263,     0,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   157,   158,   159,   160,   418,     0,   630,     0,   161,
+      162,   163,   164,   165,   166,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,   167,
+      168,     0,     0,   418,   169,     0,     0,     0,     0,   289,
+      736,   108,   319,   110,   173,     0,  1463,   111,   112,   113,
+        0,     0,   114,   115,   116,   117,   118,   119,   120,   121,
+      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      132,   133,   134,   135,     0,     0,     0,   136,   137,   138,
+      139,   140,   141,   142,   143,   144,   145,   146,     0,     7,
+        8,   147,   148,   149,     0,     0,   150,     0,   151,   152,
+      153,     0,     0,     0,     0,     0,   154,   155,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,     0,     0,  1146,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,   639,
+       24,    25,   640,    27,    28,   641,    30,   642,    32,     0,
+       33,     0,     0,     0,     0,    38,    39,     0,    41,    42,
+       43,     0,     0,     0,    46,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,   157,
+      158,   159,   160,   418,     0,   683,     0,   161,   162,   163,
+      164,   165,   166,     0,     0,     0,     0,     0,    67,    68,
+       69,     0,     0,     0,     0,     0,     0,   167,   168,     0,
+        0,     0,   169,     0,     0,     0,     0,   289,     0,   108,
+      280,   281,   173,     0,  1473,   111,   112,   113,     0,     0,
       114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,   267,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,     0,   268,
-        0,     0,   269,     0,     0,   270,     0,   271,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   272,
-        0,     0,     0,     0,     0,     0,    45,    46,    47,    48,
-       49,     0,     0,     0,    53,     0,     0,    56,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,   948,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   151,     0,     0,
-        0,     0,     0,     0,   154,   155,   156,   157,   158,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   159,   273,     0,     0,     0,   161,     0,     0,
-        0,     0,   274,     0,   103,   265,     0,   165,     0,   275,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
-      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,   267,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,     0,   268,
-        0,     0,   269,     0,     0,   270,     0,   271,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   272,
-        0,     0,     0,     0,     0,     0,    45,    46,    47,    48,
-       49,     0,     0,     0,    53,     0,     0,    56,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,   968,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   151,     0,     0,
-        0,     0,     0,     0,   154,   155,   156,   157,   158,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   159,   418,     0,     0,     0,   161,     0,     0,
-        0,     0,   274,     0,   103,   265,     0,   165,     0,   519,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
-      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,   267,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,     0,   268,
-        0,     0,   269,     0,     0,   270,     0,   271,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   272,
-        0,     0,     0,     0,     0,     0,    45,    46,    47,    48,
-       49,     0,     0,     0,    53,     0,     0,    56,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,   996,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   151,     0,     0,
-        0,     0,     0,     0,   154,   155,   156,   157,   158,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   159,   418,     0,     0,     0,   161,     0,     0,
-        0,     0,   274,     0,   103,   265,     0,   165,     0,   764,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
-      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,   267,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,     0,   268,
-        0,     0,   269,     0,     0,   270,     0,   271,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   272,
-        0,     0,     0,     0,     0,     0,    45,    46,    47,    48,
-       49,     0,     0,     0,    53,     0,     0,    56,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,  1089,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   151,     0,     0,
-        0,     0,     0,     0,   154,   155,   156,   157,   158,     0,
+      124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+      134,   135,   282,     0,     0,     0,     0,     0,     0,     0,
+        0,   142,   143,   144,  1029,   146,     0,     0,     0,     7,
+        8,     0,     0,     0,     0,     0,   151,   152,   153,     0,
+        0,     0,     0,     0,   154,     0,     0,     0,   283,     0,
+        0,   284,     0,     0,   285,     0,   286,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   287,     0,
+        0,     0,     0,     0,     0,    48,    49,    50,    51,    52,
+        0,     0,     0,     0,    56,     0,     0,    59,     0,   639,
+       24,    25,   640,    27,    28,   641,    30,   642,    32,     0,
+       33,     0,     0,     0,     0,    38,    39,     0,    41,    42,
+       43,     0,     0,     0,    46,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   157,     0,     0,
+      160,     0,     0,     0,     0,   161,   162,   163,   164,   165,
+        0,     0,     0,     0,     0,     0,     0,     0,    67,    68,
+       69,     0,     0,     0,     0,   167,   288,     0,     0,     0,
+      169,     0,     0,     0,     0,   289,     0,   108,   280,  1326,
+      173,     0,   290,   111,   112,   113,     0,     0,   114,   115,
+      116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+      126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      282,     0,     0,     0,     0,     0,     0,     0,     0,   142,
+      143,   144,     0,   146,  1034,     0,     0,     7,     8,     0,
+        0,     0,     0,     0,   151,   152,   153,     0,     0,     0,
+        0,     0,   154,     0,     0,     0,   283,     0,     0,   284,
+        0,     0,   285,     0,   286,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   287,     0,     0,     0,
+        0,     0,     0,    48,    49,    50,    51,    52,     0,     0,
+        0,     0,    56,     0,     0,    59,     0,   639,    24,    25,
+      640,    27,    28,   641,    30,   642,    32,     0,    33,     0,
+        0,     0,     0,    38,    39,     0,    41,    42,    43,     0,
+        0,     0,    46,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   157,     0,     0,   160,     0,
+        0,     0,     0,   161,   162,   163,   164,   165,     0,     0,
+        0,     0,     0,     0,     0,     0,    67,    68,    69,     0,
+        0,     0,     0,   167,   288,     0,     0,     0,   169,     0,
+        0,     0,     0,   289,     0,   108,   280,     0,   173,     0,
+     1327,   111,   112,   113,     0,     0,   114,   115,   116,   117,
+      118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+      128,   129,   130,   131,   132,   133,   134,   135,   282,     0,
+        0,     0,     0,     0,     0,     0,     0,   142,   143,   144,
+        0,   146,  1142,     0,     0,     7,     8,     0,     0,     0,
+        0,     0,   151,   152,   153,     0,     0,     0,     0,     0,
+      154,     0,     0,     0,   283,     0,     0,   284,     0,     0,
+      285,     0,   286,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   287,     0,     0,     0,     0,     0,
+        0,    48,    49,    50,    51,    52,     0,     0,     0,     0,
+       56,     0,     0,    59,     0,   639,    24,    25,   640,    27,
+       28,   641,    30,   642,    32,     0,    33,     0,     0,     0,
+        0,    38,    39,     0,    41,    42,    43,     0,     0,     0,
+       46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,   157,     0,     0,   160,     0,     0,     0,
+        0,   161,   162,   163,   164,   165,     0,     0,     0,     0,
+        0,     0,     0,     0,    67,    68,    69,     0,     0,     0,
+        0,   167,   288,     0,     0,     0,   169,     0,     0,     0,
+        0,   289,     0,   108,   280,     0,   173,     0,   290,   111,
+      112,   113,     0,     0,   114,   115,   116,   117,   118,   119,
+      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+      130,   131,   132,   133,   134,   135,   282,     0,     0,     0,
+        0,     0,     0,     0,     0,   142,   143,   144,     0,   146,
+     1644,     0,     0,     7,     8,     0,     0,     0,     0,     0,
+      151,   152,   153,     0,     0,     0,     0,     0,   154,     0,
+        0,     0,   283,     0,     0,   284,     0,     0,   285,     0,
+      286,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,   287,     0,     0,     0,     0,     0,     0,    48,
+       49,    50,    51,    52,     0,     0,     0,     0,    56,     0,
+        0,    59,     0,   639,    24,    25,   640,    27,    28,   641,
+       30,   642,    32,     0,    33,     0,     0,     0,     0,    38,
+       39,     0,    41,    42,    43,     0,     0,     0,    46,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   159,   273,     0,     0,     0,   161,     0,     0,
-        0,     0,   274,     0,   103,   265,     0,   165,     0,  1268,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
-      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,   267,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,     0,     0,     0,     0,     0,   148,     0,   268,
-        0,     0,   269,     0,     0,   270,     0,   271,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   272,
-        0,     0,     0,     0,     0,     0,    45,    46,    47,    48,
-       49,     0,     0,     0,    53,     0,     0,    56,   386,   387,
-      388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-      398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
-        0,     0,     0,     0,     0,  1354,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,   151,     0,     0,
-        0,     0,     0,     0,   154,   155,   156,   157,   158,     0,
+        0,   157,     0,     0,   160,     0,     0,     0,     0,   161,
+      162,   163,   164,   165,     0,     0,     0,     0,     0,     0,
+        0,     0,    67,    68,    69,     0,     0,     0,     0,   167,
+      439,     0,     0,     0,   169,     0,     0,     0,     0,   289,
+        0,   108,   280,     0,   173,     0,   542,   111,   112,   113,
+        0,     0,   114,   115,   116,   117,   118,   119,   120,   121,
+      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      132,   133,   134,   135,   282,     0,     0,     0,     0,     0,
+        0,     0,     0,   142,   143,   144,     0,   146,  1715,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   151,   152,
+      153,     0,     0,     0,     0,     0,   154,     0,     0,     0,
+      283,     0,     0,   284,     0,     0,   285,     0,   286,     0,
         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   473,  1376,     0,     0,     0,   161,     0,     0,
-        0,     0,   475,     0,   103,   305,     0,   165,     0,   234,
-      106,   107,   108,     0,     0,   109,   110,   111,   112,   113,
+      287,     0,     0,     0,     0,     0,     0,    48,    49,    50,
+       51,    52,     0,     0,     0,     0,    56,     0,     0,    59,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1421,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,   157,
+        0,     0,   160,     0,     0,     0,     0,   161,   162,   163,
+      164,   165,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,   167,   439,     0,
+      418,     0,   169,     0,     0,     0,     0,   289,   572,   108,
+      280,     0,   173,     0,   794,   111,   112,   113,     0,     0,
       114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      124,   125,   126,   127,   128,   129,   130,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,   137,   138,   139,     0,
-      141,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-      146,   147,   103,   305,   105,     0,     0,   148,   106,   107,
-      108,     0,     0,   109,   110,   111,   112,   113,   114,   115,
+      124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+      134,   135,   282,     0,     0,     0,     0,     0,     0,     0,
+        0,   142,   143,   144,     0,   146,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   151,   152,   153,     0,
+        0,     0,     0,     0,   154,     0,     0,     0,   283,     0,
+        0,   284,     0,     0,   285,     0,   286,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,   287,     0,
+        0,     0,     0,     0,     0,    48,    49,    50,    51,    52,
+        0,     0,     0,     0,    56,     0,     0,    59,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,     0,     0,  1440,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,   157,     0,     0,
+      160,     0,     0,     0,     0,   161,   162,   163,   164,   165,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,   167,   288,     0,   418,     0,
+      169,     0,     0,     0,     0,   289,   729,   108,   280,     0,
+      173,     0,  1331,   111,   112,   113,     0,     0,   114,   115,
       116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-      126,   127,   128,   129,   130,     0,     0,     0,   131,   132,
-      133,   134,   135,   136,   137,   138,   139,   140,   141,     0,
-        0,     0,   142,   143,     0,   144,     0,   145,   146,   147,
-        0,     0,     0,     0,     0,   148,   149,     0,     0,     0,
-        0,     0,   386,   387,   388,   389,   390,   391,   392,   393,
-      394,   395,   396,   397,   398,   399,     0,   151,     0,     0,
-      400,     0,     0,     0,   154,   155,   156,   157,   158,  1373,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   473,   474,     0,     0,     0,   161,     0,     0,
-        0,     0,   475,     0,     0,     0,     0,   165,     0,   234,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,   151,   152,   153,   400,     0,
-        0,     0,   154,   155,   156,   157,   158,  1427,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      159,   160,     0,     0,     0,   161,   103,   265,     0,     0,
-      274,     0,   106,   107,   108,   165,     0,   109,   110,   111,
-      112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-      122,   123,   124,   125,   126,   127,   128,   129,   130,   267,
-        0,     0,     0,     0,     0,     0,     0,     0,   137,   138,
-      139,     0,   141,     0,     0,     0,     0,     0,     0,     0,
-        0,   145,   146,   147,     0,     0,     0,     0,     0,   148,
-        0,   268,     0,     0,   269,     0,     0,   270,     0,   271,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,   272,     0,     0,     0,     0,     0,     0,    45,    46,
-       47,    48,    49,     0,     0,     0,    53,     0,     0,    56,
-      386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-      396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
-        0,     0,     0,     0,     0,     0,     0,  1428,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,   151,
-        0,     0,     0,     0,     0,     0,   154,   155,   156,   157,
-      158,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,   159,   418,     0,     0,     0,   161,
-      103,   305,     0,     0,   274,     0,   106,   107,   108,   165,
-        0,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+      126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      282,     0,     0,     0,     0,     0,     0,     0,     0,   142,
+      143,   144,     0,   146,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   151,   152,   153,     0,     0,     0,
+        0,     0,   154,     0,     0,     0,   283,     0,     0,   284,
+        0,     0,   285,     0,   286,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   287,     0,     0,     0,
+        0,     0,     0,    48,    49,    50,    51,    52,     0,     0,
+        0,     0,    56,     0,     0,    59,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,     0,     0,  1495,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   157,     0,     0,   160,     0,
+        0,     0,     0,   161,   162,   163,   164,   165,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,   495,  1443,     0,   418,     0,   169,     0,
+        0,     0,     0,   497,  1507,   108,   319,   110,   173,     0,
+      247,   111,   112,   113,     0,     0,   114,   115,   116,   117,
       118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-      128,   129,   130,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,   137,   138,   139,     0,   141,     0,     0,     0,
-        0,     0,     0,   103,   305,   145,   146,   147,     0,   106,
-      107,   108,     0,   148,   109,   110,   111,   112,   113,   114,
-      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-      125,   126,   127,   128,   129,   130,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,   137,   138,   139,     0,   141,
-        0,     0,     0,     0,     0,     0,     0,     0,   145,   146,
-      147,     0,     0,     0,     0,     0,   148,   386,   387,   388,
-      389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
-      399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
-        0,     0,     0,   151,  1429,     0,     0,     0,     0,     0,
-      154,   155,   156,   157,   158,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,   159,   160,
-        0,     0,     0,   161,     0,     0,     0,     0,   274,     0,
-        0,   550,     0,   165,     0,     0,     0,    -4,     1,     0,
-        0,    -4,     0,     0,     0,     0,   151,     0,     0,    -4,
-       -4,     0,     0,   154,   155,   156,   157,   158,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-        0,   159,   160,     0,    -4,    -4,   161,     0,     0,     0,
-        0,   274,     0,     0,     0,     0,   165,    -4,    -4,    -4,
-        0,     0,    -4,     0,    -4,     0,     0,     0,    -4,    -4,
-        0,    -4,    -4,     0,     0,    -4,    -4,    -4,    -4,    -4,
-       -4,    -4,    -4,    -4,    -4,     0,    -4,    -4,    -4,    -4,
-       -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,     0,    -4,
-       -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,
+      128,   129,   130,   131,   132,   133,   134,   135,     0,     0,
+        0,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+      145,   146,     0,     0,     0,   147,   148,   149,     0,     0,
+      150,     0,   151,   152,   153,     0,     0,     0,     0,     0,
+      154,   155,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,     0,     0,  1496,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1497,     0,     0,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,   157,   158,   159,   160,  1498,     0,     0,
+        0,   161,   162,   163,   164,   165,   166,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,   167,   168,     0,     0,   418,   169,   108,   280,     0,
+        0,   289,   737,   111,   112,   113,   173,     0,   114,   115,
+      116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+      126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+      282,     0,     0,     0,     0,     0,     0,     0,     0,   142,
+      143,   144,     0,   146,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,   151,   152,   153,     0,     0,     0,
+        0,     0,   154,     0,     0,     0,   283,     0,     0,   284,
+        0,     0,   285,     0,   286,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   287,     0,     0,     0,
+        0,     0,     0,    48,    49,    50,    51,    52,     0,     0,
+        0,     0,    56,     0,     0,    59,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,     0,     0,  1499,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,   157,     0,     0,   160,     0,
+        0,     0,     0,   161,   162,   163,   164,   165,     0,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,   167,   439,     0,     0,   418,   169,   108,
+      319,     0,     0,   289,   803,   111,   112,   113,   173,     0,
+      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+      124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+      134,   135,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,   142,   143,   144,     0,   146,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,   151,   152,   153,     0,
+        0,     0,     0,     0,   154,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,     0,     0,     0,     0,     0,
+        0,     0,  1531,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,     0,     0,     0,     0,     0,     0,     0,
+     1593,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,    -4,     1,     0,     0,    -4,     0,     0,     0,
+        0,     0,     0,     0,    -4,    -4,     0,   157,     0,     0,
+      160,     0,     0,     0,     0,   161,   162,   163,   164,   165,
+        0,     0,     0,     0,     0,     0,     0,     0,     0,    -4,
+       -4,     0,     0,     0,     0,   167,   168,     0,     0,     0,
+      169,     0,    -4,    -4,    -4,   289,     0,     0,    -4,    -4,
+      173,    -4,     0,     0,     0,    -4,    -4,     0,    -4,    -4,
+        0,     0,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,
+       -4,    -4,    -4,    -4,     0,    -4,    -4,    -4,    -4,    -4,
+       -4,    -4,    -4,    -4,    -4,    -4,    -4,     0,    -4,    -4,
+       -4,    -4,    -4,    -4,    -4,    -4,    -4,     0,    -4,    -4,
        -4,    -4,    -4,    -4,    -4,    -4,     0,     0,     0,    -4,
-       -4,    -4,     0,     0,     0,     0,     0,    -4,     6,     0,
-        0,     0,    -4,    -4,    -4,    -4,     7,     8,    -4,     0,
+       -4,    -4,     6,     0,     0,     0,     0,    -4,     0,     0,
+        7,     8,    -4,    -4,    -4,    -4,     0,     0,    -4,     0,
        -4,     0,    -4,    -4,    -4,    -4,    -4,    -4,    -4,    -4,
++<<<<<<< HEAD
 +      -4,    -4,    -4,     0,     0,     0,    -4,    -4,    -4,    -4,
 +       0,     9,    10,     0,     0,     0,     0,     0,     0,     0,
 +       0,     0,     0,     0,    11,    12,    13,     0,     0,    14,
 +       0,    15,     0,     0,     0,    16,    17,     0,    18,    19,
 +       0,     0,    20,    21,    22,    23,    24,    25,    26,    27,
 +      28,    29,     0,    30,    31,    32,    33,    34,    35,    36,
 +      37,    38,    39,    40,    41,     0,    42,    43,    44,    45,
 +      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
 +      56,    57,    58,     0,     0,     0,    59,    60,    61,     0,
 +       0,     0,     0,     0,    62,     0,     0,     0,     0,    63,
 +      64,    65,    66,     0,     0,    67,     0,    68,     0,    69,
 +      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
 +       0,     0,     0,    80,    81,    82,    83,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1430,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1431,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1461,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1516,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1526,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1527,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1548,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1551,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1554,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1581,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1585,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1620,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1622,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1624,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1642,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,     0,     0,  1666,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +       0,     0,  1703,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,     0,     0,
 +    1704,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,     0,     0,  1705,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,     0,     0,  1706,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,     0,   697,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,     0,     0,     0,     0,     0,     0,
 +    1437,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,   761,     0,     0,     0,     0,   704,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,   704,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,   705,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,   773,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +     804,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,   812,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,   813,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,   814,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,   825,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +     930,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,   931,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,   932,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,   963,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1048,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1087,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1088,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1143,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1276,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1277,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1278,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1279,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1314,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1315,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1322,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1462,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1463,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1464,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1465,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1481,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1482,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1486,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1566,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1567,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1568,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1569,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1576,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1579,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1616,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1633,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1634,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1635,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,     0,
 +       0,     0,  1636,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,     0,     0,     0,  1675,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,     0,     0,     0,  1676,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,     0,     0,     0,
 +    1677,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,     0,     0,     0,  1678,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,   605,
 +     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
 +     396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
 +       0,     0,   778,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,   785,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400,     0,     0,     0,   791,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,   867,   386,   387,   388,   389,   390,   391,   392,   393,
 +     394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
 +     400,     0,     0,     0,   956,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,     0,     0,   957,   386,   387,
 +     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
 +     398,   399,     0,     0,     0,     0,   400,     0,     0,     0,
 +     961,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,     0,     0,   962,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,     0,     0,   964,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,     0,     0,   998,
 +     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
 +     396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
 +       0,     0,  1043,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,     0,     0,  1273,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400,     0,     0,     0,  1305,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,     0,
 +       0,  1450,   386,   387,   388,   389,   390,   391,   392,   393,
 +     394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
 +     400,     0,   602,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,   652,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,   656,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,   657,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400,     0,   659,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,   661,   386,   387,
 +     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
 +     398,   399,     0,     0,     0,     0,   400,     0,   662,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,   665,
 +     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
 +     396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
 +     666,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,   761,   386,   387,   388,   389,   390,   391,   392,   393,
 +     394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
 +     400,     0,   769,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,   770,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,   771,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,   777,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400,     0,   889,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,   894,   386,   387,
 +     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
 +     398,   399,     0,     0,     0,     0,   400,     0,   899,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,   902,
 +     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
 +     396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
 +     903,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,   909,   386,   387,   388,   389,   390,   391,   392,   393,
 +     394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
 +     400,     0,   914,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,   915,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,   916,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,   947,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400,     0,   949,   386,   387,   388,
 +     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
 +     399,     0,     0,     0,     0,   400,     0,   950,   386,   387,
 +     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
 +     398,   399,     0,     0,     0,     0,   400,     0,   951,   386,
 +     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
 +     397,   398,   399,     0,     0,     0,     0,   400,     0,   955,
 +     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
 +     396,   397,   398,   399,     0,     0,     0,     0,   400,     0,
 +    1174,   386,   387,   388,   389,   390,   391,   392,   393,   394,
 +     395,   396,   397,   398,   399,     0,     0,     0,     0,   400,
 +       0,  1355,   386,   387,   388,   389,   390,   391,   392,   393,
 +     394,   395,   396,   397,   398,   399,     0,     0,     0,     0,
 +     400,     0,  1372,   386,   387,   388,   389,   390,   391,   392,
 +     393,   394,   395,   396,   397,   398,   399,     0,     0,     0,
 +       0,   400,     0,  1395,   386,   387,   388,   389,   390,   391,
 +     392,   393,   394,   395,   396,   397,   398,   399,     0,     0,
 +       0,     0,   400,     0,  1575,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,     0,
 +       0,     0,     0,   400,     0,  1640,   386,   387,   388,   389,
 +     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
 +       0,     0,     0,     0,   400
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+       -4,    -4,    -4,     0,     0,     9,    10,    -4,    -4,    -4,
+       -4,     0,     0,     0,     0,     0,     0,    -4,    11,    12,
+       13,     0,     0,     0,    14,    15,     0,    16,     0,     0,
+        0,    17,    18,     0,    19,    20,     0,     0,    21,    22,
+       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+        0,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+       42,    43,    44,     0,    45,    46,    47,    48,    49,    50,
+       51,    52,    53,     0,    54,    55,    56,    57,    58,    59,
+       60,    61,     0,     0,     0,    62,    63,    64,     0,     0,
+        0,     0,     0,    65,     0,     0,     0,     0,    66,    67,
+       68,    69,     0,     0,    70,     0,    71,     0,    72,    73,
+       74,    75,    76,    77,    78,    79,    80,    81,    82,     0,
+        0,     0,     0,    83,    84,    85,    86,     0,     0,     0,
+        0,     0,     0,    87,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,     0,
+        0,  1603,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,     0,     0,  1604,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1632,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,     0,     0,  1635,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,     0,     0,  1638,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,     0,
+        0,  1665,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,     0,     0,  1672,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1707,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,     0,     0,  1709,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,     0,     0,  1711,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,     0,
+        0,  1729,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,     0,     0,  1755,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1793,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,     0,     0,  1794,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,     0,     0,  1798,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,     0,
+        0,  1799,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,     0,     0,  1800,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,     0,     0,  1801,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,   837,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,   845,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,   846,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,   847,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,   858,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,   974,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,   975,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,   976,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1007,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1098,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1144,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1145,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1200,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1339,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1340,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1341,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1342,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1379,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1380,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1387,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1532,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1533,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1534,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1535,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1551,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1552,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1556,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1650,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1651,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1652,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1653,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1660,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1663,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1703,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1720,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1721,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1722,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,     0,     0,     0,  1723,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,     0,     0,
+        0,  1766,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,     0,     0,     0,  1767,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+        0,     0,     0,  1768,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,     0,     0,     0,  1769,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+      399,     0,   400,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,     0,     0,   631,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,   808,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,     0,
+        0,   816,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,   824,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,     0,     0,   904,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,     0,     0,
+     1000,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,     0,     0,  1001,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,     0,     0,  1005,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,     0,     0,     0,     0,   418,     0,     0,     0,  1006,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+        0,     0,  1008,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,     0,     0,  1045,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,     0,     0,  1093,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,     0,
+        0,  1336,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,     0,     0,  1370,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,     0,     0,  1520,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,   687,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,   688,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+      690,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,   692,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,   693,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,   696,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,   697,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,   791,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,   799,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,     0,     0,     0,     0,   418,     0,   800,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,   801,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,   807,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+      815,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,   823,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,   903,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,   928,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,   933,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,   938,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,   941,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,     0,     0,     0,     0,   418,     0,   942,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,   948,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,   957,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+      958,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,   959,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,   991,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418,     0,   993,   404,   405,   406,   407,   408,   409,
+      410,   411,   412,   413,   414,   415,   416,   417,     0,     0,
+        0,     0,   418,     0,   994,   404,   405,   406,   407,   408,
+      409,   410,   411,   412,   413,   414,   415,   416,   417,     0,
+        0,     0,     0,   418,     0,   995,   404,   405,   406,   407,
+      408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+        0,     0,     0,     0,   418,     0,   999,   404,   405,   406,
+      407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
+      417,     0,     0,     0,     0,   418,     0,  1233,   404,   405,
+      406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
+      416,   417,     0,     0,     0,     0,   418,     0,  1422,   404,
+      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+      415,   416,   417,     0,     0,     0,     0,   418,     0,  1439,
+      404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+      414,   415,   416,   417,     0,     0,     0,     0,   418,     0,
+     1462,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,     0,     0,     0,     0,   418,
+        0,  1659,   404,   405,   406,   407,   408,   409,   410,   411,
+      412,   413,   414,   415,   416,   417,     0,     0,     0,     0,
+      418,     0,  1727,   404,   405,   406,   407,   408,   409,   410,
+      411,   412,   413,   414,   415,   416,   417,     0,     0,     0,
+        0,   418
++>>>>>>> upstream/2.10.1+dfsg1
  };
  
- #define yypact_value_is_default(Yystate) \
-   (!!((Yystate) == (-1266)))
- 
- #define yytable_value_is_error(Yytable_value) \
-   YYID (0)
- 
  static const yytype_int16 yycheck[] =
  {
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +       3,   349,   237,     6,     4,     4,     3,   456,   457,     4,
 +     362,   903,   364,     4,   249,   899,     4,     3,   222,     4,
 +    1210,     4,     4,     4,    13,     5,     5,     5,   177,   101,
 +       6,     6,     6,     6,     6,   184,     6,     6,     4,     6,
 +       4,     6,     6,     4,     7,     4,    64,     0,     6,    67,
 +       4,     6,    70,   174,   175,     6,     4,   179,     6,   294,
 +      70,   296,    72,   184,   186,   542,   543,   544,   545,   546,
 +     547,   548,   549,   550,   551,   552,    70,   554,   555,   556,
 +     557,   558,   559,   560,   177,  1275,   179,     7,   565,   566,
 +     167,   168,   178,   202,   203,   204,   177,   183,   207,   208,
 +     209,   167,   168,     8,   167,   168,   183,   183,   185,   185,
 +      64,   167,   168,     6,    68,    67,    64,   183,    70,   185,
 +      72,   184,   117,   118,   119,   120,    80,   185,    67,   185,
 +     177,    70,   190,     4,   243,   244,   194,   167,   168,    67,
 +     115,     7,    70,   201,     8,   136,   255,   256,     6,   167,
 +     168,   167,   168,   183,   183,   185,   185,   115,   161,   177,
 +     115,   127,   128,  1353,   115,   162,   184,   183,   127,   128,
 +     173,   174,   174,   175,   178,   161,   180,  1061,   177,   179,
 +     184,   181,   184,  1373,     6,   184,   186,   173,   174,   177,
 +     185,   167,   168,   184,     6,   164,   184,   164,    70,   184,
 +      72,   184,   184,   184,   184,   184,   184,   177,   173,   174,
 +     184,   184,   447,   448,   184,   179,   177,    70,   181,    72,
 +      91,    92,    93,    94,     7,   167,   168,   127,    99,     6,
 +     582,   102,   467,   585,   154,   155,   156,   157,   174,   175,
 +     140,   141,   184,     6,   169,   170,   171,     6,   184,    45,
 +      46,   176,    48,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   177,   167,   168,
 +     179,   176,     7,   177,   184,   179,   167,   168,   177,   177,
 +     185,   183,   186,   185,   519,   184,   184,   179,   154,   155,
 +     156,   157,   364,   184,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   174,   175,
 +     167,   168,   176,  1503,    74,   181,   179,   375,   181,   167,
 +     168,   185,   183,   186,   185,   177,   183,   167,   168,   169,
 +     170,   171,   184,   177,   811,   183,   176,    70,   341,   342,
 +     343,   344,   345,   346,   347,   348,   349,     7,     8,   178,
 +     353,   354,   355,   356,   183,   341,   342,   343,   344,   345,
 +     346,   347,   348,   349,   660,   661,   662,   353,   354,   355,
 +     356,   154,   155,   156,   157,   174,   175,   342,   343,   344,
 +     345,   346,   347,   348,  1574,   183,   177,   185,   353,   354,
 +     355,   174,   175,   745,    70,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   178,
 +     177,   180,   305,   176,   183,     4,     5,   167,   168,   154,
 +     155,   156,   157,     6,     7,   483,   484,   485,    64,   225,
 +     226,    67,   177,   183,    70,   670,    72,   233,   178,   174,
 +     175,   237,   179,   183,   181,   177,   504,     7,   177,   186,
 +      39,    40,    41,    42,    43,    44,   167,   168,   351,   456,
 +     457,     6,    51,    52,   357,    12,    13,   167,   168,   541,
 +     180,   184,   183,   183,    63,   533,   953,   954,   955,   956,
 +      70,   958,   959,   183,   174,   175,   963,   964,   167,   168,
 +    1382,   181,  1384,   178,  1386,   180,   167,   168,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   183,   585,   167,   168,   176,    64,    65,    66,
 +      67,    68,    69,    70,    71,    72,    73,   183,    75,   185,
 +     183,     4,     5,    80,    81,    70,    83,    84,    85,   183,
 +      64,   185,    89,    67,   167,   168,    70,     7,   167,   168,
 +       6,     7,   178,  1437,   143,   144,  1440,   183,   180,  1443,
 +     183,   183,    72,   621,   183,   623,    39,    40,    41,    42,
 +      43,    44,   183,     8,   185,   122,   123,   124,    51,    52,
 +     177,   183,   178,   185,   180,   174,   175,   183,   167,   168,
 +      63,   183,   181,   185,   154,   155,   156,   157,  1490,   803,
 +      67,  1078,    67,    87,   183,    70,   178,    72,   180,   667,
 +     183,   183,   185,    97,   174,   175,   184,   969,   167,   168,
 +     178,   105,   106,   107,   627,   183,   629,   111,   112,   113,
 +     114,   184,   178,   985,   183,   167,   168,   183,   185,   711,
 +    1524,   627,   183,   629,   185,  1537,   183,  1539,   185,  1541,
 +     183,   183,   185,   167,   168,  1547,   714,    70,   454,   455,
 +     718,   719,   720,   721,   629,   183,   462,   185,   726,   183,
 +     143,   144,    67,   745,  1558,   167,   168,  1561,   750,   183,
 +    1564,   185,    67,  1567,   167,   168,  1578,   178,  1580,   180,
 +    1582,   183,   183,   586,   154,   155,   156,   157,    70,   177,
 +     183,   185,   177,   167,   168,   167,   168,  1591,   178,  1593,
 +     180,  1595,     4,   183,   174,   175,     4,     4,   776,   183,
 +     183,   183,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   177,     4,  1188,
 +    1189,   176,   183,   178,   185,  1097,   177,   750,   806,   807,
 +     808,   809,   824,     6,   177,   183,   179,   185,   181,     6,
 +       4,   184,     6,   186,   750,     6,   659,   660,   661,   662,
 +     177,   774,   976,   179,   183,   778,   185,     4,   781,   782,
 +     783,     4,   183,    64,   185,   750,    67,   790,   774,    70,
 +     177,    72,   778,   177,   177,   781,   782,   783,   856,    12,
 +      13,     7,   177,   183,   790,   185,   183,   177,   185,   774,
 +     183,     7,   185,   778,   177,   177,   781,   782,   783,   183,
 +      87,   185,   183,   177,   185,   790,   829,   177,   177,    82,
 +      97,   183,   183,   185,   185,   183,     4,   185,   105,   106,
 +     107,     6,   184,   829,   111,   112,   113,   114,   183,   921,
 +     185,    64,    65,    66,    67,    68,    69,    70,    71,    72,
 +      73,   183,    75,   185,   829,   184,   184,    80,    81,    87,
 +      83,    84,    85,   183,     6,   185,    89,   673,   183,    97,
 +     185,   183,     6,   185,   680,   184,   177,   105,   106,   107,
 +     686,   177,     6,   111,   112,   113,   114,   969,   183,   183,
 +     185,   185,   155,   156,   157,   158,   159,     4,   177,   122,
 +     123,   124,   183,   183,   185,   185,   177,   177,   185,   172,
 +     183,   179,   185,   176,   183,  1129,   185,   183,  1377,   185,
 +     184,   184,   185,   186,   187,   177,   189,   190,   191,   192,
 +     177,   194,   195,   196,   183,   183,   185,   185,   201,   183,
 +     179,   185,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   219,   185,   177,   183,
 +     176,   185,   185,   184,   177,   228,   229,   184,   183,   183,
 +     185,   185,   184,   183,   237,   185,   184,   177,   177,   177,
 +     177,  1339,   184,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   184,   184,   179,
 +    1068,   176,   179,   179,     5,   268,   269,   270,     5,     5,
 +     181,    87,     6,     6,   184,   130,   279,   280,   281,  1101,
 +     283,    97,     6,   286,   287,     6,     6,   290,   184,   105,
 +     106,   107,   838,   184,     6,   111,   112,   113,   114,   179,
 +     303,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +       4,   176,   315,   181,   176,     7,   319,   320,   321,   322,
 +     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
 +     333,   334,   335,   336,   337,   338,   339,   340,   186,   179,
 +      87,   887,   888,   889,   186,   184,     7,   350,   185,   352,
 +      97,     6,     6,     6,   177,     7,  1109,  1000,   105,   106,
 +     107,     7,   177,   177,   111,   112,   113,   114,   177,   185,
 +       7,   374,   375,  1109,   377,   378,   379,   380,   381,   382,
 +     383,   384,   385,   386,   387,   388,   389,   390,   391,   178,
 +    1344,   394,  1145,     6,  1109,     7,  1218,   184,     6,   184,
 +       7,     6,     6,     6,   407,     4,  1391,     4,   184,  1145,
 +     413,   184,   184,   127,   184,   418,   178,     6,     6,     6,
 +     423,   424,   183,   178,   178,   183,   429,   430,     6,     4,
 +    1145,   434,   183,   183,   183,   178,   439,   440,   441,   183,
 +     178,  1188,  1189,   178,     4,     6,   185,     6,   180,     6,
 +     130,   190,     7,     7,     7,   194,   459,   460,   461,   462,
 +     463,   464,   201,     7,   130,   468,   469,   470,   471,   472,
 +       7,     7,   130,   476,     7,     7,   479,   480,  1121,   184,
 +     483,   484,   485,     4,   181,   488,   489,   490,   491,     6,
 +      12,    13,    87,   496,   185,   185,     6,   180,     7,     7,
 +       7,   504,    97,   181,     6,  1148,  1491,   510,   511,   184,
 +     105,   106,   107,     6,  1060,     6,   111,   112,   113,   114,
 +       6,     6,  1330,     7,   184,     6,   529,   177,   179,   268,
 +     533,   270,   535,   177,   164,     7,   539,     7,     7,     7,
 +       7,  1184,    64,    65,    66,    67,    68,    69,    70,    71,
 +      72,    73,    72,    75,     7,     7,     6,   178,    80,    81,
 +       7,    83,    84,    85,   178,     7,  1374,    89,   178,   178,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   587,  1228,  1339,  1395,   176,     7,
 +     185,     7,  1235,  1236,     6,     4,     4,   177,   184,     6,
 +     122,   123,   124,  1339,     6,   184,     7,    87,  1154,     6,
 +      70,     7,     7,     7,     6,   618,     6,    97,   621,     6,
 +     623,   624,     6,     6,     4,   105,   106,   107,   631,   632,
 +    1377,   111,   112,   113,   114,     4,   375,     4,   185,   178,
 +       6,     6,   645,     4,  1190,   183,  1192,     6,  1194,   178,
 +     178,   654,   178,     7,   181,     6,   659,   660,   661,   662,
 +     184,   177,  1208,   185,   667,  1211,  1212,   181,   407,     6,
 +      80,   674,   675,   184,     6,     4,     6,   680,   184,   184,
 +     184,     6,     6,   184,  1492,     6,  1494,     5,     7,     6,
 +     693,     7,     7,   696,     7,     7,   184,   184,     6,     6,
 +     179,     6,     6,     6,     4,   185,   184,   197,   184,   184,
 +       6,   714,     6,   126,     6,   718,   719,   720,   721,   183,
 +       6,     4,     4,   726,     4,     6,     4,     6,   218,     6,
 +     733,   221,   735,   736,     6,     6,     6,     6,     6,     6,
 +       6,  1549,     6,     5,   483,   484,   485,     6,   184,     6,
 +       6,   130,     6,     6,     6,   245,    87,     6,     6,   183,
 +     763,     6,     6,     6,     6,   504,    97,   178,   771,   772,
 +     773,     6,   511,   776,   105,   106,   107,     7,     6,     6,
 +     111,   112,   113,   114,   184,   788,     6,     5,   181,     6,
 +     793,     6,    68,   796,   533,     6,     6,     6,   184,     6,
 +    1553,     6,   184,   806,   807,   808,   809,     6,   185,   812,
 +     300,   301,   185,   184,   184,     7,   184,  1553,  1461,     6,
 +     184,     6,   312,   125,     6,   185,     6,   128,     6,     6,
 +       6,     6,  1585,     6,  1587,  1381,     6,  1383,  1553,  1385,
 +     184,     6,     6,     6,     6,   184,   184,  1393,     6,  1585,
 +    1396,  1587,  1605,   856,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,  1605,
 +    1585,   185,  1587,   176,    87,   184,     6,     6,    12,    13,
 +       6,     6,   621,     6,   623,     6,     6,  1530,     6,     6,
 +    1605,     6,   631,   632,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,     6,     6,
 +     185,   184,   176,     6,   917,     6,     6,   920,     6,     6,
 +       6,   184,     6,   184,   184,     6,   184,   930,   667,   184,
 +      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
 +       6,    75,     6,   946,     6,   184,    80,    81,  1494,    83,
 +      84,    85,    12,    13,     6,    89,     6,     6,   184,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,     6,   977,   714,   184,   176,     6,   718,
 +     719,   720,   721,     6,     6,   988,   989,   726,   122,   123,
 +     124,     6,   997,  1464,  1358,     3,   999,  1000,  1005,   405,
 +    1359,     3,   433,    -1,    64,    65,    66,    67,    68,    69,
 +      70,    71,    72,    73,    -1,    75,  1125,    -1,    -1,    -1,
 +      80,    81,    -1,    83,    84,    85,    -1,    -1,    -1,    89,
 +      -1,    -1,    -1,    -1,  1037,  1038,  1039,   776,    -1,    -1,
 +      -1,    -1,    -1,    -1,  1047,    -1,  1049,    -1,    -1,    -1,
 +      -1,   185,    -1,    -1,    -1,    -1,    -1,  1060,    -1,    -1,
 +      -1,    -1,   122,   123,   124,  1068,    -1,   806,   807,   808,
 +     809,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,  1089,  1090,  1091,   176,
 +      -1,    -1,    -1,    -1,   584,    -1,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,    -1,   856,    -1,  1122,
 +      -1,    -1,    -1,    -1,    -1,   185,    -1,    -1,    -1,    -1,
 +      -1,    12,    13,  1136,    -1,    -1,    -1,    -1,  1141,    -1,
 +      -1,    -1,    -1,    -1,    -1,  1148,    -1,    -1,    87,  1152,
 +    1153,    -1,    -1,    -1,    -1,    -1,  1159,  1160,    97,    -1,
 +      -1,  1164,    -1,    -1,    -1,   655,   105,   106,   107,  1172,
 +      -1,    -1,   111,   112,   113,   114,   666,    -1,    -1,  1182,
 +       5,  1184,    -1,    64,    65,    66,    67,    68,    69,    70,
 +      71,    72,    73,  1196,    75,    -1,    -1,    -1,    -1,    80,
 +      81,    -1,    83,    84,    85,  1208,    -1,    -1,    89,  1212,
 +      87,    -1,  1215,    -1,    39,    40,    41,    42,    43,    44,
 +      97,    -1,    -1,    -1,    -1,  1228,    51,    52,   105,   106,
 +     107,    -1,    -1,  1236,   111,   112,   113,   114,    63,    -1,
 +      -1,   122,   123,   124,    -1,    -1,   185,    -1,    -1,  1252,
 +    1253,    -1,   742,    -1,     3,     4,    -1,  1260,    -1,    -1,
 +       9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
 +      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
 +      29,    30,    31,    32,    33,    34,    35,    -1,    -1,    -1,
 +      -1,  1294,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
 +      -1,    -1,    -1,    -1,   185,    54,    55,    56,   185,  1312,
 +      -1,  1314,    -1,    62,    -1,    -1,    87,    -1,   143,   144,
 +      -1,    -1,  1325,    -1,  1327,    -1,    97,  1330,    -1,  1068,
 +      -1,    -1,    -1,  1336,   105,   106,   107,    -1,    -1,    -1,
 +     111,   112,   113,   114,    -1,    -1,  1349,    -1,    -1,    87,
 +       6,  1354,   842,   843,    -1,   845,    -1,   847,   848,    97,
 +      -1,   851,   852,    -1,    -1,    -1,    -1,   105,   106,   107,
 +      -1,  1374,    -1,   111,   112,   113,   114,    -1,  1381,    -1,
 +    1383,    -1,  1385,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,  1395,   142,    -1,    -1,  1399,    -1,    -1,    -1,
 +     149,   150,   151,   152,   153,    -1,    -1,    -1,    -1,    -1,
 +      -1,  1414,  1415,    -1,   185,    -1,  1419,    -1,   167,   168,
 +      -1,    -1,    -1,   172,    -1,    -1,  1429,    -1,   177,    -1,
 +    1433,    -1,    -1,   182,    -1,   184,    -1,    -1,    -1,    87,
 +      -1,    -1,   932,   933,   934,    -1,    -1,   185,    -1,    97,
 +      -1,    -1,   942,    -1,    -1,    -1,  1459,   105,   106,   107,
 +      -1,  1464,    -1,   111,   112,   113,   114,    -1,  1471,  1208,
 +      -1,    -1,    -1,  1212,    -1,  1478,    -1,    -1,  1481,    -1,
 +      -1,  1484,    -1,    -1,    -1,  1488,    -1,    -1,    -1,  1492,
 +      -1,  1494,    -1,    -1,    -1,    -1,    -1,    -1,  1501,    -1,
 +     990,  1504,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,  1006,    -1,    -1,    -1,
 +     176,    -1,  1012,    -1,    -1,    -1,    -1,    -1,  1018,    87,
 +    1020,  1021,    -1,  1536,    -1,  1025,    -1,   185,    -1,    97,
 +    1030,  1031,  1032,    -1,    -1,    -1,  1549,   105,   106,   107,
 +      -1,    -1,    -1,   111,   112,   113,   114,  1047,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,  1062,    -1,   176,  1314,  1066,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
 +      -1,  1330,    -1,     9,    10,    11,    -1,  1336,    14,    15,
 +      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
 +      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
 +       8,    -1,    -1,    -1,    -1,    -1,    -1,   185,    -1,    45,
 +      46,    47,    -1,    -1,    -1,  1374,    -1,    -1,    54,    55,
 +      56,    -1,    -1,    -1,    -1,  1135,    62,     3,     4,    -1,
 +      -1,    -1,    -1,     9,    10,    11,  1395,    -1,    14,    15,
 +      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
 +      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
 +      -1,    -1,    -1,    -1,    -1,  1175,  1176,  1177,  1178,    45,
 +      46,    47,    -1,    -1,    -1,    -1,    -1,    -1,    54,    55,
 +      56,    -1,    -1,    -1,    -1,    -1,    62,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +    1210,    -1,   176,    -1,    -1,    -1,   142,    -1,    -1,    -1,
 +      -1,    -1,  1222,   149,   150,   151,   152,   153,    -1,  1229,
 +      -1,  1231,    -1,    -1,    -1,  1235,    -1,    -1,    -1,     6,
 +      -1,   167,   168,  1492,    -1,  1494,   172,    -1,    -1,    -1,
 +      -1,   177,    -1,    -1,  1254,    -1,   182,    -1,     6,    -1,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,  1275,   142,     6,   176,    -1,
 +      -1,    -1,    -1,   149,   150,   151,   152,   153,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +    1549,   167,   168,    -1,    -1,    -1,   172,    -1,    -1,  1309,
 +      -1,   177,    -1,    -1,   180,    -1,   182,    -1,     3,     4,
 +       5,    -1,    -1,    -1,     9,    10,    11,    -1,    -1,    14,
 +      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
 +      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
 +      35,    -1,    -1,  1353,    39,    40,    41,    42,    43,    44,
 +      45,    46,    47,    -1,    -1,    -1,    51,    52,    -1,    54,
 +      55,    56,    -1,  1373,    -1,    -1,    -1,    62,    63,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +    1390,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,  1445,    -1,   176,    -1,    -1,
 +      -1,   136,    -1,    -1,    -1,    -1,    -1,   142,   143,   144,
 +      -1,    -1,    -1,    -1,   149,   150,   151,   152,   153,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   167,   168,    -1,    -1,    -1,   172,    -1,    -1,
 +      -1,    -1,   177,    -1,   179,    -1,   181,   182,    -1,   184,
 +      -1,   186,    -1,  1503,     3,     4,    -1,    -1,    -1,    -1,
 +       9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
 +      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
 +      29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
 +      -1,    -1,    -1,    12,    13,    54,    55,    56,    -1,    -1,
 +      -1,    -1,    -1,    62,    -1,    64,    -1,    -1,    67,    -1,
 +      -1,    70,    -1,    72,  1574,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,
 +      -1,    -1,    91,    92,    93,    94,    95,    -1,    -1,    -1,
 +      99,    -1,    -1,   102,    -1,    64,    65,    66,    67,    68,
 +      69,    70,    71,    72,    73,    -1,    75,    -1,    -1,    -1,
 +      -1,    80,    81,    -1,    83,    84,    85,    -1,    -1,    -1,
 +      89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,
 +     149,   150,   151,   152,   153,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   122,   123,   124,    -1,    -1,   167,   168,
 +      -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,   177,    -1,
 +      -1,     3,     4,   182,    -1,   184,   185,     9,    10,    11,
 +      -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
 +      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
 +      32,    33,    34,    35,    36,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    45,    46,    47,   185,    -1,    -1,    -1,
 +      -1,    -1,    54,    55,    56,    -1,    -1,    12,    13,    -1,
 +      62,    -1,    64,    -1,    -1,    67,    -1,    -1,    70,    -1,
 +      72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,
 +      92,    93,    94,    95,    -1,    -1,    -1,    99,    -1,    -1,
 +     102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
 +      65,    66,    67,    68,    69,    70,    71,    72,    73,    -1,
 +      75,    -1,    -1,    -1,    -1,    80,    81,    -1,    83,    84,
 +      85,    -1,     6,    -1,    89,    -1,    -1,    -1,    -1,    -1,
 +     142,    -1,    -1,    -1,    -1,    -1,    -1,   149,   150,   151,
 +     152,   153,     6,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,   167,   168,   122,   123,   124,
 +     172,    -1,    -1,    -1,    -1,   177,    -1,    -1,    -1,    -1,
 +     182,    -1,    -1,   185,     3,     4,     5,    -1,    -1,    -1,
 +       9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
 +      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
 +      29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
 +      39,    40,    41,    42,    43,    44,    45,    46,    47,    -1,
 +     185,    -1,    51,    52,    -1,    54,    55,    56,    -1,    -1,
 +      -1,    -1,    -1,    62,    63,    64,    -1,    -1,    67,    -1,
 +      -1,    70,    -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,
 +      -1,    -1,    91,    92,    93,    94,    95,    -1,    -1,    -1,
 +      99,    -1,    -1,   102,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,   142,   143,   144,    -1,    -1,    -1,    -1,
 +     149,   150,   151,   152,   153,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
 +      -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,   177,    -1,
 +       3,     4,     5,   182,    -1,   184,     9,    10,    11,    -1,
 +      -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
 +      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
 +      33,    34,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    45,    46,    47,    -1,    -1,    -1,    12,    13,
 +      -1,    54,    55,    56,    -1,    -1,    -1,    -1,    -1,    62,
 +      -1,    64,    -1,    -1,    67,    -1,    -1,    70,    -1,    72,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
 +      93,    94,    95,    -1,    -1,    -1,    99,    -1,    -1,   102,
 +      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
 +      -1,    75,    -1,    -1,    -1,    -1,    80,    81,    -1,    83,
 +      84,    85,    -1,    -1,    -1,    89,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
 +      -1,    -1,    -1,    -1,    -1,    -1,   149,   150,   151,   152,
 +     153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,
 +     124,    -1,    -1,    -1,   167,   168,    -1,    -1,    -1,   172,
 +      -1,    -1,    -1,    -1,   177,    -1,     3,     4,     5,   182,
 +      -1,   184,     9,    10,    11,    -1,    -1,    14,    15,    16,
 +      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
 +      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,
 +      47,   185,    -1,    -1,    12,    13,    -1,    54,    55,    56,
 +      -1,    -1,    -1,    -1,    -1,    62,    -1,    64,    -1,    -1,
 +      67,    -1,    -1,    70,    -1,    72,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
 +      -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,    -1,
 +      -1,    -1,    99,    -1,    -1,   102,    64,    65,    66,    67,
 +      68,    69,    70,    71,    72,    73,    -1,    75,    -1,    -1,
 +      -1,    -1,    80,    81,    -1,    83,    84,    85,    -1,    -1,
 +       6,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,    -1,     6,
 +      -1,    -1,   149,   150,   151,   152,   153,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   122,   123,   124,    -1,    -1,    -1,
 +     167,   168,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,
 +     177,    -1,     3,     4,    -1,   182,    -1,   184,     9,    10,
 +      11,    -1,    -1,    14,    15,    16,    17,    18,    19,    20,
 +      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
 +      31,    32,    33,    34,    35,    36,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    45,    46,    47,   185,    -1,    -1,
 +      -1,    -1,    -1,    54,    55,    56,    -1,    -1,    -1,    -1,
 +      -1,    62,    -1,    64,    -1,    -1,    67,    -1,    -1,    70,
 +      -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,
 +      91,    92,    93,    94,    95,    -1,    -1,    -1,    99,    -1,
 +      -1,   102,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,     8,    -1,    -1,    -1,   176,
 +      -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,   149,   150,
 +     151,   152,   153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
 +      -1,   172,    -1,    -1,    -1,    -1,   177,    -1,     3,     4,
 +      -1,   182,    -1,   184,     9,    10,    11,    -1,    -1,    14,
 +      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
 +      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
 +      35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      45,    46,    47,    -1,    -1,    -1,    -1,    -1,    -1,    54,
 +      55,    56,    -1,    -1,    -1,    -1,    -1,    62,    -1,    64,
 +      -1,    -1,    67,    -1,    -1,    70,    -1,    72,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,
 +      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,
 +      95,    -1,    -1,    -1,    99,    -1,    -1,   102,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,     8,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,
 +      -1,    -1,    -1,     8,   149,   150,   151,   152,   153,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   167,   168,    -1,    -1,    -1,   172,    -1,    -1,
 +      -1,    -1,   177,    -1,     3,     4,    -1,   182,    -1,   184,
 +       9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
 +      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
 +      29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
 +      -1,    -1,    -1,    -1,    -1,    54,    55,    56,    -1,    -1,
 +      -1,    -1,    -1,    62,    -1,    64,    -1,    -1,    67,    -1,
 +      -1,    70,    -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,
 +      -1,    -1,    91,    92,    93,    94,    95,    -1,    -1,    -1,
 +      99,    -1,    -1,   102,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,     8,    -1,    -1,
 +      -1,   176,    -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,
 +     149,   150,   151,   152,   153,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
 +      -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,   177,    -1,
 +       3,     4,    -1,   182,    -1,   184,     9,    10,    11,    -1,
 +      -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
 +      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
 +      33,    34,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    45,    46,    47,    -1,    -1,    -1,    -1,    -1,
 +      -1,    54,    55,    56,    -1,    -1,    -1,    -1,    -1,    62,
 +      -1,    64,    -1,    -1,    67,    -1,    -1,    70,    -1,    72,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
 +      93,    94,    95,    -1,    -1,    -1,    99,    -1,    -1,   102,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,     8,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
 +      -1,    -1,    -1,    -1,    -1,    -1,   149,   150,   151,   152,
 +     153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   167,   168,    -1,    -1,    -1,   172,
 +      -1,    -1,    -1,    -1,   177,    -1,     3,     4,    -1,   182,
 +      -1,   184,     9,    10,    11,    -1,    -1,    14,    15,    16,
 +      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
 +      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,
 +      47,    -1,    -1,    -1,    87,    -1,    -1,    54,    55,    56,
 +      -1,    -1,    -1,    -1,    -1,    62,    -1,    64,    -1,    -1,
 +      67,    -1,    -1,    70,    -1,    72,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,
 +      -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,    -1,
 +      -1,    -1,    99,    -1,    -1,   102,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,   142,    -1,    -1,    -1,    -1,
 +      -1,    -1,   149,   150,   151,   152,   153,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     167,   168,    -1,    -1,    -1,   172,    -1,    -1,    -1,    -1,
 +     177,    -1,     3,     4,     5,   182,    -1,   184,     9,    10,
 +      11,    -1,    -1,    14,    15,    16,    17,    18,    19,    20,
 +      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
 +      31,    32,    33,    34,    35,    -1,    -1,    -1,    39,    40,
 +      41,    42,    43,    44,    45,    46,    47,    -1,    -1,    -1,
 +      51,    52,    -1,    54,    55,    56,    -1,     3,     4,     5,
 +      -1,    62,    63,     9,    10,    11,    -1,    -1,    14,    15,
 +      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
 +      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
 +      -1,    -1,    -1,    39,    40,    41,    42,    43,    44,    45,
 +      46,    47,    -1,    -1,    -1,    51,    52,    -1,    54,    55,
 +      56,    -1,    -1,    -1,    -1,    -1,    62,    63,    -1,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,   142,   143,   144,   183,    -1,   185,    -1,   149,   150,
 +     151,   152,   153,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
 +      -1,   172,    -1,    -1,    -1,    -1,   177,    -1,    -1,    -1,
 +      -1,   182,    -1,   184,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   142,   143,   144,    -1,
 +      -1,    -1,    -1,   149,   150,   151,   152,   153,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,   167,   168,    -1,    -1,    -1,   172,    -1,    -1,    -1,
 +      -1,   177,    -1,     3,     4,     5,   182,    -1,   184,     9,
 +      10,    11,    -1,    -1,    14,    15,    16,    17,    18,    19,
 +      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
 +      30,    31,    32,    33,    34,    35,    -1,    -1,    -1,    39,
 +      40,    41,    42,    43,    44,    45,    46,    47,    -1,    -1,
 +      -1,    51,    52,    -1,    54,    55,    56,    -1,    -1,    -1,
 +      -1,    -1,    62,    63,    -1,    -1,     3,     4,    -1,    -1,
 +      -1,    -1,     9,    10,    11,    -1,    -1,    14,    15,    16,
 +      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
 +      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,
 +      47,    -1,    -1,    -1,    -1,    -1,    -1,    54,    55,    56,
 +      -1,    -1,    -1,    -1,    -1,    62,    -1,    64,    -1,    -1,
 +      67,    -1,    -1,    70,    -1,    72,    -1,    -1,    -1,    -1,
 +      -1,    -1,   142,   143,   144,    -1,    -1,    84,    -1,   149,
 +     150,   151,   152,   153,    91,    92,    93,    94,    95,    -1,
 +      -1,    -1,    99,    -1,    -1,   102,    -1,   167,   168,    -1,
 +      -1,    -1,   172,    -1,    -1,    -1,    -1,   177,    -1,    -1,
 +      -1,    -1,   182,    -1,   184,    -1,    -1,    -1,    -1,    -1,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,   142,    -1,    -1,   176,    -1,
 +      -1,    -1,   149,   150,   151,   152,   153,   185,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     167,   168,    -1,    -1,    -1,   172,     3,     4,     5,    -1,
 +     177,    -1,     9,    10,    11,   182,    -1,    14,    15,    16,
 +      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
 +      27,    28,    29,    30,    31,    32,    33,    34,    35,    -1,
 +      -1,    -1,    39,    40,    41,    42,    43,    44,    45,    46,
 +      47,    -1,    -1,    -1,    51,    52,    -1,    54,    55,    56,
 +      -1,    -1,    -1,    -1,    -1,    62,    63,   108,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
 +     131,   132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   144,   145,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,    -1,   185,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,   142,   143,   144,    -1,    -1,
 +      -1,    -1,   149,   150,   151,   152,   153,    -1,    -1,    -1,
 +       0,     1,    -1,    -1,     4,    -1,    -1,    -1,    -1,    -1,
 +     167,   168,    12,    13,    -1,   172,    -1,    -1,    -1,    -1,
 +     177,    -1,    -1,    -1,    -1,   182,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    49,
 +      50,    -1,    -1,    53,    -1,    -1,    -1,    57,    58,   260,
 +      60,    61,    -1,    -1,    64,    65,    66,    67,    68,    69,
 +      70,    71,    72,    73,    -1,    75,    76,    77,    78,    79,
 +      80,    81,    82,    83,    84,    85,    86,    -1,    88,    89,
 +      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
 +     100,   101,   102,   103,   104,    -1,    -1,    -1,   108,   109,
 +     110,    -1,    -1,    -1,    -1,    -1,   116,     4,    -1,    -1,
 +      -1,   121,   122,   123,   124,    12,    13,   127,    -1,   129,
 +      -1,   131,   132,   133,   134,   135,   136,   137,   138,   139,
 +     140,   141,    -1,    -1,    -1,   145,   146,   147,   148,    -1,
 +      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    48,    49,    50,    -1,    -1,    53,    -1,    -1,    -1,
 +      57,    58,    -1,    60,    61,    -1,    -1,    64,    65,    66,
 +      67,    68,    69,    70,    71,    72,    73,    -1,    75,    76,
 +      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
 +      -1,    88,    89,    90,    91,    92,    93,    94,    95,    96,
 +      97,    98,    99,   100,   101,   102,   103,   104,    12,    13,
 +      -1,   108,   109,   110,    -1,    -1,    -1,    -1,    -1,   116,
 +      -1,    -1,    -1,    -1,   121,   122,   123,   124,    -1,    -1,
 +     127,    -1,   129,    -1,   131,   132,   133,   134,   135,   136,
 +     137,   138,   139,   140,   141,    -1,    -1,    -1,   145,   146,
 +     147,   148,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
 +      -1,    75,    -1,    -1,    -1,    -1,    80,    81,    -1,    83,
 +      84,    85,    -1,    -1,    -1,    89,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,
 +      -1,   183,    -1,   185,    -1,    -1,    -1,    -1,   122,   123,
 +     124,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   185,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     185,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   185,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     185,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   185,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     185,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   185,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     185,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   185,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   185,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   185,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     185,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   185,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,   184,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   184,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,   178,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,   183,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,   183,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,   183,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,   183,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,   183,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,   183,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,   183,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,   183,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,   183,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,   183,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,   183,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,   183,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,    -1,    -1,    -1,   183,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,
 +     183,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,    -1,    -1,    -1,   183,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,
 +      -1,    -1,   183,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,    -1,    -1,    -1,   183,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,
 +      -1,   180,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,    -1,    -1,    -1,   180,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,   180,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,
 +     180,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,   180,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,    -1,    -1,   180,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,   180,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,
 +      -1,    -1,   180,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,    -1,    -1,   180,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,   180,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,
 +      -1,   180,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,    -1,    -1,    -1,   180,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,    -1,    -1,   180,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,    -1,    -1,
 +     180,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,    -1,    -1,   180,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,    -1,    -1,   180,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,
 +     178,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,   178,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,    -1,   178,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,   178,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,   178,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,
 +     178,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,   178,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,    -1,   178,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,   178,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,   178,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,
 +     178,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,
 +      -1,   178,   158,   159,   160,   161,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,
 +     176,    -1,   178,   158,   159,   160,   161,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,    -1,    -1,    -1,
 +      -1,   176,    -1,   178,   158,   159,   160,   161,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,    -1,    -1,
 +      -1,    -1,   176,    -1,   178,   158,   159,   160,   161,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,    -1,
 +      -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,   161,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +      -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,   159,
 +     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,   158,
 +     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,   178,
 +     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,    -1,    -1,    -1,    -1,   176,    -1,
 +     178,   158,   159,   160,   161,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,    -1,    -1,    -1,    -1,   176
 +=======
 +       3,  1266,   227,     4,   946,   349,     4,   351,   467,   468,
 +       4,     6,     4,     6,     3,   359,   242,     4,     4,    74,
 +       5,     5,     5,     4,     6,     4,     6,     6,   254,   102,
 +       4,     4,     4,   181,     5,   373,     5,   375,     5,     5,
 +     188,     5,     5,     5,     0,     6,    46,    47,     6,    49,
 +       7,     6,     6,     6,     6,   181,     4,   183,     6,    62,
 +       4,   942,   171,   172,   190,     6,     4,     4,   183,   529,
 +     171,   172,  1337,    76,     6,   190,   302,   131,   304,     3,
 +     189,     6,     6,   171,   172,   183,   187,   185,   189,    68,
 +     144,   145,   190,    71,   171,   172,    74,     7,    76,   187,
 +     560,   561,   562,   563,   564,   565,   566,   567,   568,   569,
 +     570,   188,   572,   573,   574,   575,   576,   577,   578,   181,
 +       8,   183,   582,   583,   584,   171,   172,   121,   122,   123,
 +     124,    68,    13,   593,     4,    72,   187,   119,   189,   131,
 +     132,   187,   181,   189,   178,   179,    74,    84,    76,   134,
 +     134,   134,    76,   140,   188,  1420,   181,    95,    96,    97,
 +      98,   119,   165,   134,     6,   103,   119,   119,   106,     6,
 +     181,  1436,   183,    71,   177,   178,    74,   166,   183,   190,
 +     185,   184,   183,   181,   185,   190,   181,   190,     7,   190,
 +     188,    71,   195,   188,    74,   189,   199,   177,   178,   202,
 +     181,   188,   188,   206,   207,   208,   209,   188,     6,   212,
 +     213,   214,   550,   168,   188,   188,   188,   188,     6,   188,
 +     223,   188,   188,   226,   188,   188,   188,   188,   185,  1110,
 +     230,   231,   458,   459,   188,   183,     7,   181,   238,   171,
 +     172,   165,   242,   168,     7,   248,   249,   250,   158,   159,
 +     160,   161,   478,   177,   178,   171,   172,   260,   261,   181,
 +     184,   131,   132,   182,   602,   184,     7,   605,   178,   179,
 +     273,   187,   275,   189,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,   182,     6,
 +     184,   190,   180,   187,   171,   172,   195,     7,   171,   172,
 +     199,   189,   375,     6,   181,   308,   309,   206,   171,   172,
 +     536,   188,   181,  1578,    68,   188,   181,    71,   321,   188,
 +      74,   314,    76,   188,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,   158,
 +     159,   160,   161,   180,   178,   179,   349,   350,   351,   352,
 +     353,   354,   355,   356,   357,   183,   359,   360,   181,   178,
 +     179,   364,   365,   366,   367,   188,   185,   171,   172,   362,
 +     350,   183,   352,   353,   354,   368,   356,   357,   181,   184,
 +     360,   384,   187,   187,   364,   365,   366,   158,   159,   160,
 +     161,   178,   179,    78,   854,   158,   159,   160,   161,  1664,
 +      71,   188,   181,    74,     8,    76,    68,   178,   179,    71,
 +      68,   184,    74,    71,   187,   418,    74,   158,   159,   160,
 +     161,   181,   171,   172,   181,   349,   350,   351,   352,   353,
 +     354,   181,   356,   357,   181,   359,   360,   178,   179,   188,
 +     364,   365,   366,   367,   171,   172,    74,   785,   158,   159,
 +     160,   161,    74,   446,   447,   448,   449,    91,   188,   187,
 +     187,   189,     6,   178,   179,   465,   466,   101,   178,   179,
 +     185,   171,   172,   473,   700,   109,   110,   111,   467,   468,
 +      74,   115,   116,   117,   118,   384,   559,   187,   171,   172,
 +      74,   494,   495,   496,   207,   208,   209,   171,   172,   212,
 +     213,   214,   505,  1445,   187,  1447,   187,  1449,   189,   171,
 +     172,   171,   172,   187,   171,   172,   519,   171,   172,   181,
 +     187,    76,   189,   526,   171,   172,   188,   187,   178,   179,
 +     187,    71,   605,   187,   182,   248,   249,   997,   188,   187,
 +     187,   181,  1002,  1003,  1004,  1005,  1006,   260,   261,   188,
 +     553,   182,  1012,  1013,     4,     5,   187,    74,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,   910,   911,   912,   913,   180,   182,   187,   184,
 +     189,   505,   187,   171,   172,   189,   171,   172,   188,    39,
 +      40,    41,    42,    43,    44,   494,   495,   496,    48,   187,
 +      71,   604,   187,    53,    54,   182,    56,   184,   171,   172,
 +     187,   171,   172,   606,   171,   172,   182,    67,   184,  1561,
 +     519,   846,   188,  1504,   187,    71,  1507,   187,     4,  1510,
 +     187,   182,    74,   171,   172,     4,   187,    91,   641,   187,
 +     643,   189,     4,   646,   171,   172,   649,   101,   651,   187,
 +     653,   654,     6,   182,   553,   109,   110,   111,   187,     4,
 +     187,   115,   116,   117,   118,   181,   646,  1127,   741,     4,
 +     182,   651,   184,   187,   677,   189,   188,  1619,  1138,  1621,
 +    1018,  1623,    91,    68,     6,   182,    71,  1629,   181,    74,
 +     187,    76,   101,   696,   697,   181,  1034,   147,   148,   182,
 +     109,   110,   111,   703,   187,   181,   115,   116,   117,   118,
 +     710,   183,   785,   173,   174,   175,   716,     4,   791,  1600,
 +     180,   187,   646,   189,   181,   649,  1668,   651,  1670,   182,
 +    1672,   184,     6,     7,   187,   189,   171,   172,   173,   174,
 +     175,   744,   641,   182,   643,   180,     7,   187,   187,   189,
 +     753,   181,   755,   183,   757,   185,   759,   182,   188,   184,
 +     190,   764,   187,  1644,   767,   187,  1647,   189,   187,  1650,
 +     189,   187,  1653,   189,    74,    74,    76,    76,   181,   782,
 +     189,   784,   187,   181,   189,  1244,  1245,   187,   791,   189,
 +     187,   187,   189,   189,   867,   187,     6,   189,   697,   187,
 +    1025,   189,   181,   187,  1685,   189,  1687,     7,  1689,     4,
 +     187,   791,   189,   816,   181,   187,  1154,   189,   821,   822,
 +     823,   824,   187,   187,   189,   189,   187,   187,   189,   189,
 +     833,   187,   825,   189,   181,   187,  1296,   189,     4,   181,
 +       6,   821,   181,   823,   824,   744,   849,   850,   851,   852,
 +     187,   181,   189,   833,   753,   187,   755,   189,   757,   187,
 +     759,   189,   187,   181,   189,   764,   181,   791,   767,   872,
 +     187,   187,   189,   189,   187,   187,   189,   189,   187,   187,
 +     189,   189,   188,   883,   887,   888,    91,   890,   181,   892,
 +     893,   964,   872,   896,   897,     6,   101,   821,   901,   823,
 +     824,   187,   181,   189,   109,   110,   111,     6,     7,   833,
 +     115,   116,   117,   118,   187,   181,   189,   816,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +     930,   931,   932,   187,   180,   189,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,  1018,   171,   172,   872,   180,
 +     849,   850,   851,   852,   187,   187,   189,   189,   188,   188,
 +    1185,     8,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,   188,   980,   981,   982,
 +     180,  1440,   181,   187,   189,   189,   187,   990,   189,   187,
 +     187,   189,   189,   187,   187,   189,   189,   181,     3,     4,
 +     181,   187,   901,   189,     9,    10,    11,   181,   181,    14,
 +      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
 +      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
 +      35,   181,   181,   181,   181,   181,  1039,   181,     6,     6,
 +      45,    46,    47,   188,    49,   188,   188,   188,   188,   181,
 +       4,     5,  1055,    58,    59,    60,  1049,   181,  1061,   181,
 +     181,    66,  1406,   183,  1067,   188,  1069,  1070,   183,   188,
 +     188,  1074,  1075,  1076,  1077,  1078,  1079,  1080,  1081,   183,
 +     183,   183,     6,  1156,   185,    39,    40,    41,    42,    43,
 +      44,   188,   134,  1096,    48,   190,   190,     6,     6,    53,
 +      54,     6,    56,   188,   188,     6,   183,     4,  1111,  1109,
 +     180,   185,  1115,    67,  1117,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,     7,
 +     183,   188,     7,   180,   189,   182,     6,     6,     6,   182,
 +       7,   146,     7,     7,     6,     4,     7,   188,   153,   154,
 +     155,   156,   157,     6,    50,     7,     6,     6,     6,     6,
 +    1163,    50,    50,    50,   188,   131,   171,   172,   182,     6,
 +       6,   176,   182,   182,  1167,   187,   181,     6,   182,   184,
 +     187,   186,   182,  1163,  1177,   187,  1411,   190,  1191,   187,
 +     187,   187,   195,   147,   148,   182,   199,     4,  1201,   184,
 +       4,  1274,     7,   206,     6,     6,     6,     6,   134,     7,
 +    1210,  1204,     7,     7,   134,     7,     7,   134,  1117,     7,
 +       7,  1201,     4,   188,   178,   179,     6,   182,  1454,   182,
 +     182,   185,   182,    91,   185,     7,     6,   184,     7,  1163,
 +     189,   189,   188,   101,   188,   188,  1246,  1240,  1248,   188,
 +    1250,   109,   110,   111,     7,  1244,  1245,   115,   116,   117,
 +     118,  1264,   185,  1266,  1264,  1268,   188,  1267,  1268,     6,
 +     273,     6,   275,    91,     6,     6,   183,  1201,     7,     6,
 +    1283,   181,   181,   101,   188,     6,   168,  1290,     7,     7,
 +    1293,   109,   110,   111,  1297,     7,  1289,   115,   116,   117,
 +     118,    76,     4,     7,  1297,  1298,     7,     6,     4,     7,
 +       7,     6,     6,  1316,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,     7,     7,
 +     101,   189,   180,     7,  1337,     7,  1562,     6,   109,   110,
 +     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
 +     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
 +     131,   132,   133,   188,    12,    13,     6,   181,  1371,   140,
 +       7,   189,   143,  1376,     6,   188,     7,   148,   149,     7,
 +       7,   384,     6,     6,     6,    74,    91,     6,     6,     4,
 +       4,     4,   189,  1396,     6,     6,   101,     6,     4,     6,
 +    1403,   187,   187,  1406,   109,   110,   111,   185,   182,   182,
 +     115,   116,   117,   118,   182,   418,   182,  1420,     7,   181,
 +      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
 +     188,    79,     6,  1436,  1437,   185,    84,    85,     6,    87,
 +      88,    89,   188,   188,  1444,    93,  1446,     6,  1448,    84,
 +    1453,  1440,   188,     6,   188,  1458,  1456,     6,   188,  1459,
 +       6,     6,     5,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,     4,   126,   127,
 +     128,   180,  1406,     5,   189,     6,     4,     7,   188,     6,
 +       6,   494,   495,   496,   265,   188,   183,  1396,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,  1512,
 +       6,   282,     6,   180,     6,   188,   519,    39,    40,    41,
 +      42,    43,    44,   526,   188,   188,    48,     6,   130,    12,
 +      13,    53,    54,     6,    56,     6,   187,     6,  1437,  1532,
 +       4,   189,     4,     6,     4,    67,   188,     6,     6,     6,
 +     553,     6,     6,     4,     6,   134,     6,     6,     6,  1458,
 +    1563,     5,  1565,     6,     6,  1565,     6,     6,     6,     6,
 +       6,     6,     6,     6,     6,  1578,     6,   187,     6,     6,
 +    1583,     6,     6,   182,     6,    68,    69,    70,    71,    72,
 +      73,    74,    75,    76,    77,     7,    79,     6,   185,     6,
 +     188,    84,    85,     6,    87,    88,    89,     5,   188,     6,
 +      93,    72,    83,     6,   189,   188,   188,  1610,   189,   188,
 +       6,   188,     7,   188,     6,   147,   148,   129,  1631,     6,
 +       6,     6,   189,   132,     6,     6,  1639,     6,   641,     6,
 +     643,     6,     6,   126,   127,   128,     6,   188,     6,     6,
 +     653,   654,     6,     6,   188,   188,     6,   189,   188,  1639,
 +      91,  1664,     6,     6,  1563,    91,  1565,     6,     6,     6,
 +       6,     6,     6,     6,   189,     6,  1679,     6,  1681,   188,
 +     188,   188,     6,     6,   188,     6,     6,     6,   159,   160,
 +     161,   162,   163,     6,   697,     6,     6,   188,   188,  1679,
 +     188,  1681,   188,   188,  1707,   176,   189,     6,     6,   180,
 +       6,     6,     6,     6,     6,  1639,     6,     6,   189,   190,
 +     191,   192,     6,   194,   195,   196,   197,  1707,   199,   200,
 +     201,     6,  1631,  1535,   416,   206,  1046,  1425,     3,  1426,
 +    1054,   744,     3,  1181,    -1,    -1,    -1,    -1,    -1,    -1,
 +     753,    -1,   755,   224,   757,  1679,   759,  1681,   444,    -1,
 +      -1,   764,   233,   234,   767,    -1,    -1,    -1,    -1,    -1,
 +      -1,   242,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,  1707,    -1,    -1,    -1,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,   273,   274,   275,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   816,   285,   286,   287,    -1,   289,    -1,
 +      -1,   292,   293,    -1,    -1,   296,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +     311,    -1,    -1,    -1,   180,    -1,   849,   850,   851,   852,
 +      -1,    -1,    -1,   324,    -1,    -1,   327,   328,   329,   330,
 +     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
 +     341,   342,   343,   344,   345,   346,   347,   348,    -1,    12,
 +      13,    -1,    -1,    -1,    -1,    -1,    -1,   358,    -1,    -1,
 +     361,    -1,   363,    -1,    -1,    -1,    -1,    -1,   901,    -1,
 +      -1,    -1,     6,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   383,   384,    -1,   386,   387,   388,   389,   390,
 +     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
 +      -1,    -1,   403,    -1,    -1,    68,    69,    70,    71,    72,
 +      73,    74,    75,    76,    77,    -1,    79,   418,    -1,    -1,
 +      -1,    84,    85,   424,    87,    88,    89,    -1,   429,     6,
 +      93,    -1,    -1,   434,   435,    -1,    -1,    -1,    -1,   440,
 +     441,    -1,    -1,    -1,   445,   446,   447,   448,   449,   450,
 +     451,   452,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   126,   127,   128,    -1,    -1,    -1,   470,
 +     471,   472,   473,   474,   475,    -1,    -1,    -1,   479,   480,
 +     481,   482,   483,    -1,    -1,    -1,   487,    -1,    -1,   490,
 +     491,    -1,    -1,   494,   495,   496,    -1,    -1,   499,   500,
 +     501,   502,    12,    13,    -1,    -1,    -1,   508,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   519,    -1,
 +      -1,    -1,    -1,    -1,   525,   526,   189,   528,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,   546,   180,    -1,    -1,    -1,
 +      -1,   552,   553,    -1,    -1,    -1,   557,    -1,    68,    69,
 +      70,    71,    72,    73,    74,    75,    76,    77,    -1,    79,
 +      -1,    -1,    -1,    -1,    84,    85,    -1,    87,    88,    89,
 +      -1,    -1,    -1,    93,  1117,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,   607,    -1,    -1,    91,
 +      -1,    -1,    -1,    -1,    -1,    -1,   126,   127,   128,   101,
 +       6,    -1,    -1,    -1,    -1,    12,    13,   109,   110,   111,
 +      -1,    91,    -1,   115,   116,   117,   118,   638,    -1,    -1,
 +     641,   101,   643,   644,    91,    -1,    -1,    -1,    -1,   109,
 +     110,   111,   653,   654,   101,   115,   116,   117,   118,    -1,
 +      -1,    -1,   109,   110,   111,    -1,   667,    -1,   115,   116,
 +     117,   118,    -1,    -1,    -1,   676,    -1,    -1,    -1,   189,
 +      -1,    68,    69,    70,    71,    72,    73,    74,    75,    76,
 +      77,    -1,    79,    -1,    -1,    -1,   697,    84,    85,    -1,
 +      87,    88,    89,   704,   705,    -1,    93,   189,    -1,   710,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   723,    -1,    -1,   726,    -1,    -1,    -1,   189,
 +      -1,  1264,    -1,    -1,    -1,  1268,    -1,    -1,    -1,   126,
 +     127,   128,   189,   744,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   753,     6,   755,    -1,   757,    -1,   759,    -1,
 +      -1,    -1,    -1,   764,    -1,    -1,   767,    -1,    -1,    -1,
 +      -1,    -1,   773,    -1,   775,   776,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    91,    -1,
 +      -1,    -1,   189,   804,    -1,    -1,    -1,    -1,   101,    -1,
 +      -1,   812,   813,   814,    -1,   816,   109,   110,   111,    -1,
 +      -1,    -1,   115,   116,   117,   118,    12,    13,    -1,    -1,
 +     831,   202,    -1,    -1,    -1,   836,    -1,    -1,   839,    -1,
 +      -1,    -1,    -1,  1376,    -1,    -1,    -1,    91,   849,   850,
 +     851,   852,   223,     6,   855,   226,    -1,   101,    -1,    -1,
 +      -1,    -1,    -1,  1396,    -1,   109,   110,   111,    -1,    -1,
 +    1403,   115,   116,   117,   118,    -1,    -1,    -1,    -1,   250,
 +      -1,    -1,    68,    69,    70,    71,    72,    73,    74,    75,
 +      76,    77,    -1,    79,    -1,    -1,   189,    -1,    84,    85,
 +     901,    87,    88,    89,  1437,    -1,    -1,    93,    -1,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,  1458,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,   308,   309,    -1,
 +     126,   127,   128,    -1,    -1,   189,    -1,    -1,    -1,    -1,
 +     321,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   960,
 +      -1,    -1,   963,    -1,    -1,    -1,   967,    -1,   969,   970,
 +     971,    -1,    -1,    -1,    -1,    -1,   977,    -1,    -1,    -1,
 +      -1,    91,    -1,    -1,   355,    -1,    -1,    -1,    -1,    -1,
 +       6,   101,    -1,   994,    -1,    12,    13,    -1,    -1,   109,
 +     110,   111,    -1,   189,    -1,   115,   116,   117,   118,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,  1026,    -1,   180,    -1,    -1,
 +    1563,    -1,  1565,    -1,    -1,    -1,  1037,  1038,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1048,  1049,    -1,
 +      -1,    68,    69,    70,    71,    72,    73,    74,    75,    76,
 +      77,    -1,    79,    -1,    12,    13,    -1,    84,    85,    -1,
 +      87,    88,    89,    -1,    -1,    -1,    93,    -1,    -1,   189,
 +      -1,    -1,    -1,    -1,    -1,  1086,  1087,  1088,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,  1096,    -1,  1098,  1631,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1109,   126,
 +     127,   128,    -1,    -1,    -1,    -1,  1117,    -1,    -1,    -1,
 +      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
 +      -1,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,    87,
 +      88,    89,  1143,  1144,  1145,    93,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    91,   180,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   189,   101,    -1,    -1,    -1,  1178,   126,   127,
 +     128,   109,   110,   111,    -1,    -1,    -1,   115,   116,   117,
 +     118,  1192,    -1,    -1,    -1,    -1,  1197,    -1,    -1,    -1,
 +      -1,    -1,    -1,  1204,    -1,    -1,    -1,  1208,  1209,    -1,
 +      -1,    -1,    -1,    -1,  1215,  1216,    -1,    -1,    -1,  1220,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1228,    -1,    -1,
 +      -1,    -1,    -1,   604,    -1,    -1,    -1,  1238,    -1,  1240,
 +      -1,   189,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,  1252,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,   189,    -1,  1264,    -1,    -1,    -1,  1268,    -1,    -1,
 +    1271,    12,    13,    -1,    -1,  1276,  1277,  1278,  1279,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1289,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1298,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   677,    12,    13,    -1,
 +      -1,    -1,    -1,  1314,  1315,    -1,    -1,    -1,    -1,    -1,
 +      -1,  1322,    -1,    -1,    -1,   696,    -1,    68,    69,    70,
 +      71,    72,    73,    74,    75,    76,    77,    -1,    79,    -1,
 +      -1,    -1,    -1,    84,    85,    -1,    87,    88,    89,    -1,
 +      -1,    -1,    93,    -1,    -1,  1356,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    68,    69,    70,    71,    72,    73,    74,
 +      75,    76,    77,  1374,    79,  1376,    -1,    -1,    -1,    84,
 +      85,    -1,    87,    88,    89,   126,   127,   128,    93,    -1,
 +    1391,    -1,  1393,    -1,    -1,  1396,    -1,    -1,    -1,    -1,
 +      -1,    -1,  1403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,   782,    -1,   784,    -1,  1416,    -1,    -1,    -1,    -1,
 +    1421,   126,   127,   128,     6,    -1,    -1,    -1,    -1,    91,
 +      -1,    -1,    -1,    -1,    -1,    -1,  1437,    -1,    -1,    -1,
 +      -1,    -1,    -1,  1444,    -1,  1446,    -1,  1448,   189,    -1,
 +      -1,   822,    -1,    -1,    -1,    -1,    -1,  1458,    -1,    -1,
 +      -1,  1462,  1463,  1464,  1465,  1466,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +    1481,  1482,     6,    -1,   189,  1486,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,  1496,    -1,    -1,    -1,  1500,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,   887,   888,   180,   890,
 +      -1,   892,   893,    -1,    -1,   896,   897,    -1,    -1,  1530,
 +      -1,    -1,    -1,    -1,  1535,    -1,    -1,    -1,    -1,    -1,
 +      -1,  1542,    -1,    -1,    -1,    -1,    -1,    -1,  1549,    -1,
 +      -1,  1552,    -1,    -1,  1555,     6,    -1,    -1,  1559,    -1,
 +      -1,    -1,  1563,    -1,  1565,  1566,  1567,  1568,  1569,    -1,
 +      -1,    -1,    -1,    -1,    -1,  1576,    -1,    -1,  1579,    -1,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   980,
 +     981,   982,    -1,    -1,    -1,  1616,    -1,    -1,    -1,   990,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +    1631,    -1,  1633,  1634,  1635,  1636,    -1,    -1,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,     6,    -1,    -1,  1039,    -1,
 +      -1,    -1,    -1,    -1,  1675,  1676,  1677,  1678,    -1,    -1,
 +      -1,    -1,    -1,    -1,  1055,     6,    -1,    -1,    -1,    -1,
 +    1061,    -1,    -1,    -1,    -1,    -1,  1067,    -1,  1069,  1070,
 +      -1,    -1,    -1,  1074,  1075,  1076,  1077,  1078,  1079,  1080,
 +    1081,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,  1096,    -1,    -1,    -1,   180,
++=======
+        3,     3,   240,     4,   364,   255,   366,   107,   390,     4,
+      489,   490,     4,     7,   374,     6,     6,   267,  1329,     4,
+      402,     4,     4,     4,     4,    13,     4,     6,   990,     4,
+        6,   189,    21,    22,     4,     6,    78,     4,   196,     4,
+        6,     5,     5,     5,     5,     3,     5,    72,     6,     5,
+       75,     5,     4,    78,    57,     6,     5,   179,   180,     6,
+        5,     5,    65,     6,   986,   190,   316,     6,   318,     6,
+      195,     6,   189,   195,   191,   197,    79,   179,   180,   185,
+      186,   198,     6,     4,   189,     6,   191,   179,   180,     6,
+      196,  1402,     6,   195,    72,   197,   179,   180,    76,    57,
+      189,   179,   180,    49,    50,   197,    52,   179,   180,     7,
+       88,   189,   195,   189,   197,   185,   186,   106,   196,     0,
+      196,    79,     7,   193,   196,   114,   115,   116,   117,   118,
+      119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+      129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+      191,    72,   193,   145,   136,   137,   145,   198,   124,   148,
+      189,   126,   127,   128,   129,   154,   155,   196,   148,   189,
+      173,   160,   174,   124,     4,   139,   139,  1488,   139,     6,
+      139,   124,   185,   186,   189,   189,   177,   124,   189,     6,
+      193,   196,   189,  1504,   191,   196,   191,   579,   201,   193,
+      203,   198,     6,   198,   196,   208,   185,   186,   189,   212,
+      200,   196,   215,   196,   189,   173,   219,   220,   221,   222,
+      196,   196,   225,   226,   227,   196,   196,   185,   186,   196,
+      480,   481,   197,   196,   196,   193,   239,   189,   177,   191,
+      196,   193,   196,   201,     6,  1167,   198,   196,   630,   631,
+      500,   196,   196,     6,   189,   179,   180,     6,   261,   262,
+      263,   196,   179,   180,   191,   179,   180,     7,   166,   167,
+      168,   169,   275,   276,   189,   185,   186,   179,   180,   179,
+      180,   166,   167,   168,   169,   288,   196,   290,   179,   180,
+      390,   280,     4,     5,   196,     8,   196,   243,   244,   136,
+      185,   186,   179,   180,   195,   251,   136,   137,   297,   255,
+      560,    75,   149,   150,    78,   185,   186,   191,   195,   328,
+      323,   324,   572,   189,   179,   180,   196,    39,    40,    41,
+       42,    43,    44,   336,   179,   180,    48,     8,   189,   329,
+      195,    53,    54,    55,   179,   180,    58,   189,   189,   191,
+      195,  1662,   185,   186,   179,   180,   198,    69,   179,   180,
+      195,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+      195,   374,   375,     7,   195,   189,   379,   380,   381,   382,
+      383,   179,   180,   179,   180,    82,   365,   377,   367,   368,
+      369,    78,   371,   372,   384,   189,   375,   195,   401,   195,
+      379,   380,   381,   382,   393,    78,   364,   365,   366,   367,
+      368,   369,    72,   371,   372,    75,   374,   375,    78,   179,
+      180,   379,   380,   381,   382,   383,   166,   167,   168,   169,
+        6,   179,   180,   815,   816,   195,   439,   196,   179,   180,
+      152,   153,  1753,    78,     7,   185,   186,   195,     7,   181,
+      182,   183,   164,   193,   195,    78,   188,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   474,   475,   185,   186,   188,    80,   467,   468,   469,
+      470,   193,   732,     8,   197,   189,   586,   489,   490,   179,
+      180,   181,   182,   183,    75,     6,     7,    78,   188,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,   516,   517,   518,   196,   188,   527,   179,
+      180,   179,   180,     6,     7,   528,   197,   179,   180,   189,
+      630,   631,   166,   167,   168,   169,   196,   195,    75,   542,
+      190,   487,   488,   195,   553,   195,   549,   179,   180,   495,
+      196,   185,   186,  1515,    78,  1517,    80,  1519,   179,   180,
+      179,   180,   190,   195,   192,     8,    78,   949,   196,   951,
+      528,   953,   190,   955,   195,   578,   195,   195,   587,   588,
+      589,   590,   591,   592,   593,   594,   595,   596,   597,    75,
+      599,   600,   601,   602,   603,   604,   605,   195,    75,   197,
+      609,   610,   611,   166,   167,   168,   169,   166,   167,   168,
+      169,   620,   190,    95,     4,   179,   180,   195,   627,   179,
+      180,    78,   185,   186,   106,   190,   185,   186,   637,     4,
+      195,   195,   114,   115,   116,   195,   179,   180,   120,   121,
+      122,   123,   632,   881,   647,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,  1581,
+      179,   180,  1584,   188,   195,  1587,   197,   670,     4,   672,
+      179,   180,   675,   773,     4,   678,   195,   680,   179,   180,
+        4,   684,   685,  1645,  1066,   190,   195,   192,     6,   189,
+      195,   191,   682,   193,   195,   189,   675,   191,   198,   193,
+     1082,   680,   196,   192,   198,   708,   195,    99,   100,    99,
+      100,   101,   102,   105,   190,   815,   816,   675,   108,   195,
+      678,   111,   680,   823,   824,   189,   729,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   195,    95,   197,  1706,   188,  1708,   190,  1710,    72,
+       99,   100,    75,   106,  1716,    78,   105,    80,   190,   189,
+      192,   114,   115,   116,   196,  1687,   189,   120,   121,   122,
+      123,   774,   190,    72,   192,   195,    75,   197,   196,    78,
+      783,    80,   785,   195,   787,   197,   789,    75,     6,   735,
+       78,   794,    80,   189,   797,    75,   742,  1759,    78,  1761,
+       80,  1763,   748,   903,   904,   192,     6,   190,   195,   192,
+      813,  1733,    95,   196,  1736,   191,   819,  1739,     4,     4,
+     1742,   824,   190,   106,   192,   189,   189,   195,  1307,  1308,
+     1212,   114,   115,   116,   189,  1073,   190,   120,   121,   122,
+      123,   195,   190,     6,   197,   824,   849,   195,   195,   189,
+      197,   854,   855,   856,   857,   189,  1778,   190,  1780,   192,
+     1782,   190,   195,   192,   867,   190,   824,   192,   858,   190,
+      195,   192,   189,   189,   195,   854,     7,   856,   857,     6,
+      889,   884,   885,   886,   887,   195,   189,   197,   867,   195,
+      195,   197,   197,   195,     6,   197,   854,   189,   856,   857,
+      195,   195,   197,   197,   189,   195,   909,   197,  1008,   867,
+      189,   920,   921,   195,   197,   197,    78,    78,    80,    80,
+      195,   189,   197,   926,   927,   195,   929,   197,   931,   932,
+      909,   196,   935,   936,   195,   189,   197,   940,   195,   195,
+      197,   197,   220,   221,   222,   196,   189,   225,   226,   227,
+      189,   909,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,  1066,   195,   189,   197,
+      188,     6,     4,   195,     6,   197,   922,   196,   189,   195,
+      203,   197,   189,   261,   262,   208,   195,   189,   197,   212,
+      195,   195,   197,   197,   191,   189,   219,   275,   276,   195,
+      195,   197,   197,   195,     4,   197,  1244,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,  1024,  1025,  1026,   195,   188,   197,   196,   974,   975,
+      976,  1510,  1035,   189,  1043,   195,   195,   197,   197,   189,
+      198,  1050,  1051,  1052,  1053,  1054,   195,   189,   197,     3,
+        4,  1060,  1061,   189,   189,     9,    10,    11,   196,   196,
+       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+       34,    35,   195,     6,   197,  1088,   195,   195,   197,   197,
+      196,    45,    46,    47,   195,    49,   197,   195,   195,   197,
+      197,   195,   189,   197,  1107,   196,    60,    61,    62,  1099,
+     1113,   196,   189,  1473,    68,  1215,  1119,   189,  1121,  1122,
+      195,   189,   197,  1126,  1127,   195,  1129,   197,  1131,   195,
+     1133,   197,  1135,  1136,  1137,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,   195,
+     1153,   197,   195,   188,   197,   195,   195,   197,   197,   195,
+        6,   197,   195,    95,   197,  1168,     7,     8,   195,  1172,
+      197,  1174,   196,   196,   106,  1184,   196,   195,   401,   197,
+      191,     6,   114,   115,   116,   195,  1195,   197,   120,   121,
+      122,   123,   195,   195,   197,   197,   191,   151,   191,   191,
+      154,     6,   193,   139,   198,   159,   160,   161,   162,   163,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,  1222,
+     1166,   196,     6,   188,     6,   179,   180,     6,   196,     6,
+      184,   191,     4,   188,   193,   189,  1226,  1337,     7,   196,
+      194,  1479,   196,  1222,   197,   195,  1236,  1250,   195,     7,
+       95,   474,   475,     6,     6,     6,   190,  1260,     7,     7,
+     1263,   106,     6,   196,  1222,   197,     7,     6,     6,   114,
+      115,   116,     7,  1263,  1524,   120,   121,   122,   123,     6,
+        6,  1260,     4,    50,    50,    50,    50,   136,   196,    95,
+      190,     6,     6,   516,   517,   518,  1299,  1300,   190,   190,
+      106,   195,  1260,   190,   190,  1307,  1308,   195,   114,   115,
+      116,   195,   195,  1303,   120,   121,   122,   123,   195,   542,
+      190,     6,     4,     6,  1327,  1271,  1329,     4,  1331,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,  1346,    12,    13,     6,   188,     6,    95,
+     1353,  1360,   197,     6,  1357,   578,     6,   196,  1361,     7,
+      106,   139,  1352,  1309,     7,  1311,     7,  1313,   114,   115,
+      116,  1361,  1362,  1363,   120,   121,   122,   123,  1381,     7,
+      139,  1327,     7,     7,  1330,  1331,     7,     7,     4,   139,
+      190,   197,     6,   195,   190,   190,  1646,   195,   195,  1402,
+      190,   195,   193,     6,    72,    73,    74,    75,    76,    77,
+       78,    79,    80,    81,   197,    83,   197,    95,   192,     7,
+       88,    89,     7,    91,    92,    93,   196,     7,   106,    97,
+        6,     6,   193,   196,   196,  1438,   114,   115,   116,   196,
+     1443,   196,   120,   121,   122,   123,     6,   670,     6,   672,
+        7,   197,     6,     6,   191,   189,   189,     6,   177,     7,
+     1463,     7,     7,   131,   132,   133,     6,  1470,   196,    80,
+     1473,     7,     7,    12,    13,     7,     7,     6,   196,     7,
+        7,     7,     7,     7,     7,  1488,     4,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,  1504,     4,     6,  1507,   188,   729,     6,  1510,   189,
+        7,     6,   196,     7,     7,  1473,     7,     6,     6,   197,
+     1523,     6,    78,     6,     6,  1528,     6,     4,     4,   197,
+        4,   197,     4,    72,    73,    74,    75,    76,    77,    78,
+       79,    80,    81,     6,    83,     6,     6,     6,     6,    88,
+       89,   774,    91,    92,    93,   195,   190,   190,    97,   190,
+      783,   190,   785,   195,   787,     7,   789,  1570,  1514,   196,
+     1516,   794,  1518,     6,   797,   193,   189,     6,   193,     6,
+     1526,     6,    88,  1529,   196,     6,  1589,    95,   196,   196,
+      196,     6,   131,   132,   133,     6,   196,     6,   106,     6,
+        5,     4,     6,    86,    87,   196,   114,   115,   116,   196,
+        6,     6,   120,   121,   122,   123,     7,   196,   196,  1609,
+      191,     6,     6,  1569,     6,     4,   849,  1573,   196,   196,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,  1647,   196,  1649,     6,   188,     6,
+        6,   135,   195,     6,     4,     6,     4,     6,   197,  1662,
+        6,   884,   885,   886,   887,     6,     6,     6,     4,     6,
+        5,    95,     6,     6,     6,     6,  1622,   196,     6,     6,
+     1626,     6,   106,   139,   167,   168,   169,   170,   171,   197,
+      114,   115,   116,     6,     6,     6,   120,   121,   122,   123,
+        6,   184,     6,  1649,     6,   188,     6,  1697,     6,   195,
+        6,     6,     6,     6,     6,  1718,     7,   940,     6,   202,
+      203,   204,   205,  1726,   207,   208,   209,   210,   190,   212,
+      213,   214,     6,     6,     6,     5,   219,     6,   193,   196,
+        6,     6,   196,   196,     7,   197,    76,  1726,   197,   196,
+     1753,   196,   196,   196,   237,     6,   134,     6,  1704,  1705,
+      197,     6,   137,   246,   247,     6,     6,  1770,  1726,  1772,
+        6,     6,   255,   197,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,     6,     6,
+        6,  1770,   188,  1772,   196,     6,     6,     6,     6,  1802,
+        6,     6,   196,   196,   196,   288,   289,   290,   196,     6,
+      197,    95,  1770,    95,  1772,   196,     6,   300,   301,   302,
+        6,   304,   106,  1802,   307,   308,     6,     6,   311,     6,
+      114,   115,   116,     6,     6,     6,   120,   121,   122,   123,
+        6,     6,   325,   326,  1802,   197,     6,     6,     6,   196,
+        6,   196,   196,   196,     6,     6,   339,   340,     6,   342,
+      343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+      353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+      363,   196,     6,     6,     6,     6,   196,   196,   196,   196,
+      373,     6,     6,   376,     6,   378,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+        6,     6,     6,   197,   188,   398,     6,     6,   401,     6,
+        6,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      413,   414,   415,   416,   417,   418,  1612,   435,   421,   422,
+     1493,  1096,  1494,     3,     3,   465,    -1,  1240,  1506,    95,
+       -1,  1174,  1106,    -1,    -1,    -1,   439,    -1,    -1,    -1,
+      106,    -1,   445,    -1,    -1,    -1,    -1,   450,   114,   115,
+      116,    -1,   455,   456,   120,   121,   122,   123,   461,   462,
+       -1,    -1,    -1,   466,   467,   468,   469,   470,   471,   472,
+      473,   474,   475,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,     6,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   492,
+      493,   494,   495,   496,   497,    -1,    -1,    -1,   501,   502,
+      503,   504,   505,    -1,    -1,    -1,   509,    -1,   511,   512,
+       -1,    -1,    -1,   516,   517,   518,    -1,    -1,   521,   522,
+      523,   524,   525,    12,    13,    -1,    -1,    -1,   531,    -1,
+       -1,   197,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   542,
+       -1,    -1,    -1,    -1,    -1,   548,   549,    -1,   551,   552,
+       -1,    -1,    12,    13,    -1,    -1,  1299,  1300,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   570,    -1,    -1,
+       -1,    -1,    -1,    -1,   577,   578,    -1,    -1,    -1,    -1,
+      583,    -1,    -1,    72,    73,    74,    75,    76,    77,    78,
+       79,    80,    81,    -1,    83,    -1,    -1,    -1,    -1,    88,
+       89,    -1,    91,    92,    93,    -1,    -1,    -1,    97,    -1,
+       -1,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+       80,    81,    -1,    83,    -1,    -1,    -1,    -1,    88,    89,
+      633,    91,    92,    93,    -1,    -1,    -1,    97,    -1,    -1,
+       -1,     6,   131,   132,   133,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,   667,    95,    -1,   670,    -1,   672,
+      673,   131,   132,   133,    -1,    -1,   106,    -1,   681,     5,
+       -1,   684,   685,     6,   114,   115,   116,    -1,    -1,    -1,
+      120,   121,   122,   123,    -1,   698,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,   707,    -1,    -1,    -1,   197,    -1,
+       -1,    -1,    -1,    39,    40,    41,    42,    43,    44,    -1,
+     1463,    -1,    48,    -1,    -1,    -1,   729,    53,    54,    55,
+       -1,    -1,    58,   736,   737,   203,    -1,   197,    -1,   742,
+      208,    -1,    -1,    69,   212,    -1,    -1,    -1,    -1,    -1,
+       -1,   219,   755,    -1,    -1,   758,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  1507,    -1,    -1,   197,    -1,    -1,
+       -1,   774,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      783,    -1,   785,    -1,   787,  1528,   789,    -1,    -1,    -1,
+        6,   794,    -1,    -1,   797,    -1,    -1,    -1,    -1,    -1,
+      803,    -1,   805,   806,    -1,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+      288,    -1,   290,   188,    -1,    -1,   152,   153,    -1,    -1,
+       -1,    -1,    -1,    -1,   837,    -1,    -1,    -1,   164,    -1,
+       -1,    -1,   845,   846,   847,    -1,   849,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   864,    -1,    -1,    -1,   188,    -1,    -1,   871,    -1,
+      215,   874,    -1,     4,     5,    -1,    -1,    -1,    -1,    -1,
+       -1,   884,   885,   886,   887,    -1,    -1,     6,   891,    -1,
+       -1,    -1,    -1,    -1,   239,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  1647,    -1,  1649,    -1,    39,    40,
+       41,    42,    43,    44,    -1,    95,    -1,    48,   263,    -1,
+       -1,    -1,    53,    54,    55,    -1,   106,    58,    -1,    -1,
+       -1,    -1,    -1,   401,   114,   115,   116,   940,    69,    -1,
+      120,   121,   122,   123,    -1,    -1,    -1,   950,    -1,   952,
+       -1,   954,    -1,   956,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,   439,   188,    -1,    -1,  1718,    -1,    -1,   323,   324,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   336,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,
+       -1,  1004,    -1,    -1,  1007,    -1,   474,   475,  1011,     6,
+     1013,  1014,  1015,    -1,    -1,    -1,    -1,   197,  1021,    -1,
+       -1,   152,   153,    -1,    -1,   370,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   164,    -1,  1038,    -1,  1040,    12,    13,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   516,   517,
+      518,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,  1074,    -1,    -1,   542,    -1,    -1,    -1,    -1,    -1,
+       -1,   549,    -1,  1086,  1087,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,  1098,  1099,    -1,    72,    73,
+       74,    75,    76,    77,    78,    79,    80,    81,    -1,    83,
+      578,    -1,    -1,    -1,    88,    89,    -1,    91,    92,    93,
+       -1,    -1,    -1,    97,    -1,    -1,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     1143,  1144,  1145,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+     1153,   195,  1155,   197,    -1,    -1,    -1,   131,   132,   133,
+       -1,    -1,    -1,  1166,    12,    13,    -1,    -1,    -1,    -1,
+       -1,  1174,    -1,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,    -1,    -1,    -1,    -1,  1200,  1201,  1202,
+       -1,    -1,   670,    -1,   672,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,   684,   685,    -1,    -1,
+       -1,     6,    -1,   197,    72,    73,    74,    75,    76,    77,
+       78,    79,    80,    81,  1237,    83,    -1,    -1,    -1,    -1,
+       88,    89,    -1,    91,    92,    93,    -1,    -1,  1251,    97,
+       -1,    -1,    -1,  1256,    -1,    -1,    -1,     6,    -1,    -1,
+       -1,   729,    -1,    -1,    -1,    -1,  1269,  1270,    -1,    -1,
+       -1,    -1,    -1,  1276,  1277,    -1,    -1,     6,  1281,    -1,
+       -1,    -1,    -1,   131,   132,   133,  1289,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  1299,  1300,  1301,    -1,
+     1303,    -1,   647,    -1,    -1,    -1,   774,    -1,    -1,    -1,
+       -1,    -1,  1315,    -1,    -1,   783,    -1,   785,    -1,   787,
+       -1,   789,    -1,     6,  1327,    -1,   794,    -1,  1331,   797,
+       -1,  1334,    -1,    -1,    -1,    -1,  1339,  1340,  1341,  1342,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1352,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1362,
+       -1,    -1,    -1,   708,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,     7,    -1,    -1,    -1,    -1,  1379,  1380,    -1,    -1,
+       -1,   849,    -1,    -1,  1387,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,   884,   885,   886,   887,
+     1423,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,  1441,   188,
+     1443,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,  1458,    -1,  1460,    -1,   188,
+     1463,    -1,    -1,    -1,    -1,    -1,    -1,  1470,   813,    -1,
+       -1,    -1,   940,    -1,   819,    -1,    -1,    -1,    -1,    -1,
+       -1,  1484,    -1,    -1,    -1,    -1,  1489,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,    -1,     8,    -1,  1507,   188,    -1,    -1,    -1,    -1,
+      855,  1514,    -1,  1516,    -1,  1518,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,  1528,    -1,    -1,    -1,  1532,
+     1533,  1534,  1535,  1536,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,  1551,  1552,
+       -1,    -1,   188,  1556,    -1,    -1,    -1,    -1,    -1,     8,
+       -1,    -1,    -1,  1566,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  1577,    -1,    -1,    -1,    -1,    -1,
+       -1,   926,   927,    -1,   929,    -1,   931,   932,    -1,    -1,
+      935,   936,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,  1607,    -1,    -1,    -1,   188,  1612,
+       -1,    -1,    -1,    -1,    -1,    -1,  1619,    -1,    -1,    -1,
++>>>>>>> upstream/2.10.1+dfsg1
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     1111,    -1,    -1,    -1,  1115,    -1,    -1,     3,     4,     5,
-       -1,    -1,    -1,     9,    10,    11,    -1,    -1,    14,    15,
-       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-       -1,    -1,    -1,    39,    40,    41,    42,    43,    44,    45,
-       46,    47,    48,    49,    -1,    -1,    -1,    53,    54,    -1,
-       56,    -1,    58,    59,    60,    -1,    -1,    -1,    -1,    -1,
-       66,    67,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     1191,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-      171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
-       -1,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-      171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
-      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-      172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
-       -1,    -1,    -1,    -1,   140,   187,    -1,   189,    -1,    -1,
-      146,   147,   148,    -1,    -1,  1266,    -1,   153,   154,   155,
-      156,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  1283,     7,     8,   171,   172,    -1,    -1,  1290,
-      176,    -1,  1293,    -1,    -1,   181,  1297,   183,    -1,   185,
-      186,    -1,   188,     8,   190,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,  1316,   162,   163,   164,   165,
-      166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-       -1,     3,     4,    -1,   180,    -1,  1337,     9,    10,    11,
-       -1,   187,    14,    15,    16,    17,    18,    19,    20,    21,
+     1633,     8,    -1,  1636,    -1,    -1,  1639,    -1,    -1,    -1,
+     1643,    -1,    -1,    -1,  1647,    -1,  1649,  1650,  1651,  1652,
+     1653,    -1,    -1,    -1,    -1,    -1,    -1,  1660,    -1,    -1,
+     1663,    -1,    -1,    -1,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,     8,  1024,
+     1025,  1026,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     1035,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     1703,    -1,     8,    -1,    -1,    -1,  1174,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,  1718,    -1,  1720,  1721,  1722,
+     1723,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,    -1,    -1,  1088,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  1756,  1757,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  1107,  1766,  1767,  1768,  1769,    -1,  1113,    -1,
+       -1,    -1,    -1,    -1,  1119,    -1,  1121,  1122,    -1,    -1,
+       -1,  1126,  1127,    -1,  1129,    -1,  1131,    -1,  1133,    -1,
+     1135,  1136,  1137,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,  1153,    95,
+       -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  1168,    -1,    -1,    -1,  1172,    -1,    -1,
+       -1,  1299,  1300,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,  1327,
+       -1,    -1,    -1,  1331,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,  1250,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,     3,     4,     5,    -1,    -1,  1263,     9,
+       10,    11,    -1,    -1,    14,    15,    16,    17,    18,    19,
+       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+       30,    31,    32,    33,    34,    35,    -1,    -1,    -1,    39,
+       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+       -1,    12,    13,    53,    54,    55,    -1,    -1,    58,    -1,
+       60,    61,    62,    -1,    -1,  1443,    -1,    -1,    68,    69,
+       -1,    -1,    -1,    -1,  1329,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,  1463,    -1,    -1,    -1,    -1,
+       -1,  1346,  1470,    -1,    -1,    -1,    -1,    -1,  1353,    -1,
+       -1,    -1,  1357,    -1,    -1,    -1,  1361,    -1,    -1,    -1,
+       -1,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+       81,    -1,    83,    -1,    -1,    -1,  1381,    88,    89,  1507,
+       91,    92,    93,    -1,    -1,    -1,    97,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   145,    -1,  1402,    -1,    -1,
+     1528,   151,   152,   153,   154,    -1,    -1,    -1,    -1,   159,
+      160,   161,   162,   163,   164,    -1,    -1,    -1,    -1,    -1,
+      131,   132,   133,    -1,    -1,    -1,    -1,    -1,    -1,   179,
+      180,    -1,    -1,  1438,   184,    -1,    -1,    -1,    -1,   189,
+       -1,   191,    -1,   193,   194,    -1,   196,    -1,   198,    -1,
+        3,     4,    -1,    -1,    -1,    -1,     9,    10,    11,    -1,
+       -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+       33,    34,    35,  1488,    -1,    -1,   197,    -1,    -1,    -1,
+       -1,    -1,    45,    46,    47,    -1,    49,    -1,    -1,  1504,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    62,
+       -1,    -1,    -1,    -1,    -1,    68,     3,     4,  1523,  1647,
+       -1,  1649,     9,    10,    11,    -1,    -1,    14,    15,    16,
+       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,
+       47,    -1,    49,    -1,    -1,  1570,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    60,    61,    62,    -1,    -1,    -1,    -1,
+       -1,    68,    -1,    -1,  1589,    72,    -1,    -1,    75,    -1,
+     1718,    78,    -1,    80,    -1,    -1,    -1,    -1,   151,    -1,
+       -1,   154,    -1,    -1,    -1,    92,   159,   160,   161,   162,
+      163,    -1,    99,   100,   101,   102,   103,    -1,    -1,    -1,
+       -1,   108,    -1,    -1,   111,    -1,   179,   180,    -1,    -1,
+       -1,   184,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,
+       -1,   194,    -1,   196,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,  1662,    -1,    -1,
+       -1,    -1,    -1,    -1,   151,    -1,    -1,   154,    -1,    -1,
+       -1,    -1,   159,   160,   161,   162,   163,    -1,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,   179,   180,    -1,    -1,   188,   184,    -1,    -1,
+       -1,    -1,   189,   195,    -1,   197,    -1,   194,    -1,   196,
+      197,     3,     4,    -1,    -1,    -1,    -1,     9,    10,    11,
+       -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
        22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-       32,    33,    34,    35,    36,    -1,    -1,    -1,    -1,    -1,
-     1371,    -1,    -1,    45,    46,    47,    -1,    49,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    58,    59,    60,    -1,
-       -1,    -1,    -1,    -1,    66,    -1,    68,    -1,    -1,    71,
-       -1,    -1,    74,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    -1,  1420,
-       -1,    -1,    -1,    95,    96,    97,    98,    99,    -1,    -1,
-       -1,   103,    -1,    -1,   106,  1436,    -1,    -1,   162,   163,
-      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-      174,   175,  1453,    -1,    -1,    -1,   180,   162,   163,   164,
-      165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-      175,     8,    -1,    -1,   146,   180,    -1,    -1,    -1,    -1,
-       -1,   153,   154,   155,   156,   157,    -1,    -1,    -1,    -1,
-        8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   171,
-      172,    -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,   181,
-       -1,  1512,    -1,    -1,   186,    -1,   188,   189,     3,     4,
-       -1,    -1,    -1,    -1,     9,    10,    11,    -1,    -1,    14,
-       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-       35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       45,    46,    47,    -1,    49,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    58,    59,    60,    -1,  1578,    -1,    -1,
-       -1,    66,  1583,    68,    -1,    -1,    71,    -1,    -1,    74,
-       -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    88,    -1,    -1,    -1,    -1,    -1,    -1,
-       95,    96,    97,    98,    99,    -1,    -1,    -1,   103,    -1,
-       -1,   106,    -1,    -1,    -1,   162,   163,   164,   165,   166,
-      167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
-       -1,    -1,    -1,   180,   162,   163,   164,   165,   166,   167,
-      168,   169,   170,   171,   172,   173,   174,   175,     8,    -1,
-       -1,   146,   180,  1664,    -1,    -1,    -1,    -1,   153,   154,
-      155,   156,   157,    -1,    -1,    -1,    -1,    -1,    -1,     8,
-       -1,    -1,    -1,    -1,    -1,    -1,   171,   172,    -1,    -1,
-       -1,   176,    -1,    -1,    -1,    -1,   181,    -1,    -1,    -1,
-       -1,   186,    -1,    -1,   189,     3,     4,     5,    -1,    -1,
-       -1,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
-       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-       28,    29,    30,    31,    32,    33,    34,    35,    36,    -1,
-       -1,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-       48,    49,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,
-       58,    59,    60,    -1,    -1,    -1,    -1,    -1,    66,    67,
-       68,    -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       88,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,
-       98,    99,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
-       -1,    -1,   162,   163,   164,   165,   166,   167,   168,   169,
-      170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
-      180,    -1,    -1,   162,   163,   164,   165,   166,   167,   168,
-      169,   170,   171,   172,   173,   174,   175,     8,   146,   147,
-      148,   180,    -1,    -1,    -1,   153,   154,   155,   156,   157,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,
-       -1,    -1,    -1,   181,    -1,     3,     4,     5,   186,    -1,
-      188,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
-       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-       28,    29,    30,    31,    32,    33,    34,    35,    36,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,
-       -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       58,    59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
-       68,    -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       88,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,
-       98,    99,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-      171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,
-       -1,    -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,
-       -1,    -1,    -1,   181,    -1,     3,     4,     5,   186,    -1,
-      188,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
-       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-       28,    29,    30,    31,    32,    33,    34,    35,    12,    13,
-       -1,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-       48,    49,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,
-       58,    59,    60,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-      172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
-      182,    -1,   184,    -1,    68,    69,    70,    71,    72,    73,
-       74,    75,    76,    77,    -1,    79,    -1,    -1,    -1,    -1,
-       84,    85,    -1,    87,    88,    89,    -1,    -1,    -1,    93,
-      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-      172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
-       -1,    -1,    -1,    -1,    -1,   187,    -1,   189,   146,   147,
-      148,    -1,   126,   127,   128,   153,   154,   155,   156,   157,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,
-       -1,    -1,    -1,   181,    -1,     3,     4,     5,   186,    -1,
-      188,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
-       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-       28,    29,    30,    31,    32,    33,    34,    35,    36,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,
-       -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       58,    59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
-       68,    -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       88,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,
-       98,    99,    -1,    -1,    -1,   103,    -1,    -1,   106,   162,
-      163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-      173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
-       -1,    -1,    -1,    -1,   187,    -1,   189,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,
-       -1,    -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,
-       -1,    -1,    -1,   181,    -1,     3,     4,     5,   186,    -1,
-      188,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
-       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-       28,    29,    30,    31,    32,    33,    34,    35,    -1,    -1,
-       -1,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-       48,    49,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,
-       58,    59,    60,    -1,     3,     4,     5,    -1,    66,    67,
-        9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
-       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-       29,    30,    31,    32,    33,    34,    35,    -1,    -1,    -1,
-       39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-       49,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,    58,
-       59,    60,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
-       -1,    -1,    -1,   162,   163,   164,   165,   166,   167,   168,
-      169,   170,   171,   172,   173,   174,   175,    -1,   146,   147,
-      148,   180,    -1,    -1,    -1,   153,   154,   155,   156,   157,
-      189,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,
-       -1,    -1,    -1,   181,    -1,    -1,    -1,    -1,   186,    -1,
-      188,    -1,   162,   163,   164,   165,   166,   167,   168,   169,
-      170,   171,   172,   173,   174,   175,    -1,   146,   147,   148,
-      180,    -1,    -1,    -1,   153,   154,   155,   156,   157,   189,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,     3,     4,    -1,   186,    -1,   188,
-        9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
-       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-       29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
-       49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-       59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
-       -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,    98,
-       99,    -1,    -1,    -1,   103,    -1,    -1,   106,   162,   163,
-      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-      174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
-       -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,     3,     4,    -1,   186,    -1,   188,
-        9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
-       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-       29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
-       49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-       59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
-       -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,    98,
-       99,    -1,    -1,    -1,   103,    -1,    -1,   106,   162,   163,
-      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-      174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
-       -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,     3,     4,    -1,   186,    -1,   188,
-        9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
-       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-       29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
-       49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-       59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
-       -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,    98,
-       99,    -1,    -1,    -1,   103,    -1,    -1,   106,   162,   163,
-      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-      174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
-       -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,     3,     4,    -1,   186,    -1,   188,
-        9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
-       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-       29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,
-       49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-       59,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
-       -1,    -1,    71,    -1,    -1,    74,    -1,    76,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    97,    98,
-       99,    -1,    -1,    -1,   103,    -1,    -1,   106,   162,   163,
-      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-      174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,
-       -1,    -1,    -1,    -1,   153,   154,   155,   156,   157,    -1,
+       32,    33,    34,    35,    36,    -1,    -1,    -1,  1753,    -1,
+       -1,    -1,    -1,    45,    46,    47,    -1,    49,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,
+       62,    -1,    -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,
+       72,    -1,    -1,    75,    -1,    -1,    78,    -1,    80,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,     3,     4,    -1,   186,    -1,   188,
+       92,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,   101,
+      102,   103,    -1,    -1,    -1,    -1,   108,    -1,    -1,   111,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,    -1,   197,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   151,
+       -1,    -1,   154,    -1,    -1,    -1,    -1,   159,   160,   161,
+      162,   163,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,   179,   180,    -1,
+      188,    -1,   184,    -1,    -1,    -1,    -1,   189,    -1,   197,
+       -1,    -1,   194,    -1,    -1,   197,     3,     4,     5,    -1,
+       -1,    -1,     9,    10,    11,    -1,    -1,    14,    15,    16,
+       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+       -1,    -1,    39,    40,    41,    42,    43,    44,    45,    46,
+       47,    48,    49,    -1,    -1,    -1,    53,    54,    55,    -1,
+       -1,    58,    -1,    60,    61,    62,    -1,    -1,    -1,    -1,
+       -1,    68,    69,    -1,    -1,    72,    -1,    -1,    75,    -1,
+       -1,    78,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    92,    -1,    -1,    -1,    -1,
+       -1,    -1,    99,   100,   101,   102,   103,    -1,    -1,    -1,
+       -1,   108,    -1,    -1,   111,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,   197,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,   151,   152,   153,   154,    -1,    -1,
+       -1,    -1,   159,   160,   161,   162,   163,   164,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,   179,   180,    -1,    -1,   188,   184,   190,    -1,
+       -1,    -1,   189,   195,     3,     4,     5,   194,    -1,   196,
         9,    10,    11,    -1,    -1,    14,    15,    16,    17,    18,
        19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
        29,    30,    31,    32,    33,    34,    35,    36,    -1,    -1,
@@@ -6107,741 -2731,841 +7130,1498 @@@
        21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
        31,    32,    33,    34,    35,    -1,    -1,    -1,    39,    40,
        41,    42,    43,    44,    45,    46,    47,    48,    49,    -1,
-       -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,    60,
-       -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,
-       -1,    -1,   162,   163,   164,   165,   166,   167,   168,   169,
-      170,   171,   172,   173,   174,   175,    -1,   146,    -1,    -1,
-      180,    -1,    -1,    -1,   153,   154,   155,   156,   157,   189,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,   171,   172,    -1,    -1,    -1,   176,    -1,    -1,
-       -1,    -1,   181,    -1,    -1,    -1,    -1,   186,    -1,   188,
-      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-      172,   173,   174,   175,    -1,   146,   147,   148,   180,    -1,
-       -1,    -1,   153,   154,   155,   156,   157,   189,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      171,   172,    -1,    -1,    -1,   176,     3,     4,    -1,    -1,
-      181,    -1,     9,    10,    11,   186,    -1,    14,    15,    16,
-       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,
-       47,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    58,    59,    60,    -1,    -1,    -1,    -1,    -1,    66,
-       -1,    68,    -1,    -1,    71,    -1,    -1,    74,    -1,    76,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    88,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,
-       97,    98,    99,    -1,    -1,    -1,   103,    -1,    -1,   106,
-      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-      172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,
-       -1,    -1,    -1,    -1,    -1,    -1,   153,   154,   155,   156,
-      157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,   171,   172,    -1,    -1,    -1,   176,
-        3,     4,    -1,    -1,   181,    -1,     9,    10,    11,   186,
-       -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-       33,    34,    35,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    45,    46,    47,    -1,    49,    -1,    -1,    -1,
-       -1,    -1,    -1,     3,     4,    58,    59,    60,    -1,     9,
-       10,    11,    -1,    66,    14,    15,    16,    17,    18,    19,
+       -1,    -1,    53,    54,    55,    -1,    -1,    58,    -1,    60,
+       61,    62,    -1,     3,     4,     5,    -1,    68,    69,     9,
+       10,    11,    -1,    -1,    14,    15,    16,    17,    18,    19,
+       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+       30,    31,    32,    33,    34,    35,    -1,    -1,    -1,    39,
+       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+       -1,    -1,    -1,    53,    54,    55,    -1,    -1,    58,    -1,
+       60,    61,    62,    -1,    -1,    -1,    -1,    -1,    68,    69,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      151,   152,   153,   154,    -1,    -1,    -1,   197,   159,   160,
+      161,   162,   163,   164,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,   179,   180,
+       -1,    -1,   188,   184,    -1,    -1,    -1,    -1,   189,    -1,
+       -1,   197,    -1,   194,    -1,   196,    -1,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   151,   152,   153,   154,   188,    -1,   190,    -1,   159,
+      160,   161,   162,   163,   164,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,   179,
+      180,    -1,    -1,   188,   184,    -1,    -1,    -1,    -1,   189,
+      195,     3,     4,     5,   194,    -1,   196,     9,    10,    11,
+       -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
+       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+       32,    33,    34,    35,    -1,    -1,    -1,    39,    40,    41,
+       42,    43,    44,    45,    46,    47,    48,    49,    -1,    12,
+       13,    53,    54,    55,    -1,    -1,    58,    -1,    60,    61,
+       62,    -1,    -1,    -1,    -1,    -1,    68,    69,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    72,
+       73,    74,    75,    76,    77,    78,    79,    80,    81,    -1,
+       83,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,    92,
+       93,    -1,    -1,    -1,    97,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,   151,
+      152,   153,   154,   188,    -1,   190,    -1,   159,   160,   161,
+      162,   163,   164,    -1,    -1,    -1,    -1,    -1,   131,   132,
+      133,    -1,    -1,    -1,    -1,    -1,    -1,   179,   180,    -1,
+       -1,    -1,   184,    -1,    -1,    -1,    -1,   189,    -1,     3,
+        4,     5,   194,    -1,   196,     9,    10,    11,    -1,    -1,
+       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+       34,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    45,    46,    47,   197,    49,    -1,    -1,    -1,    12,
+       13,    -1,    -1,    -1,    -1,    -1,    60,    61,    62,    -1,
+       -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,    72,    -1,
+       -1,    75,    -1,    -1,    78,    -1,    80,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    -1,
+       -1,    -1,    -1,    -1,    -1,    99,   100,   101,   102,   103,
+       -1,    -1,    -1,    -1,   108,    -1,    -1,   111,    -1,    72,
+       73,    74,    75,    76,    77,    78,    79,    80,    81,    -1,
+       83,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,    92,
+       93,    -1,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   151,    -1,    -1,
+      154,    -1,    -1,    -1,    -1,   159,   160,   161,   162,   163,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   131,   132,
+      133,    -1,    -1,    -1,    -1,   179,   180,    -1,    -1,    -1,
+      184,    -1,    -1,    -1,    -1,   189,    -1,     3,     4,     5,
+      194,    -1,   196,     9,    10,    11,    -1,    -1,    14,    15,
+       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+       36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
+       46,    47,    -1,    49,   197,    -1,    -1,    12,    13,    -1,
+       -1,    -1,    -1,    -1,    60,    61,    62,    -1,    -1,    -1,
+       -1,    -1,    68,    -1,    -1,    -1,    72,    -1,    -1,    75,
+       -1,    -1,    78,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    92,    -1,    -1,    -1,
+       -1,    -1,    -1,    99,   100,   101,   102,   103,    -1,    -1,
+       -1,    -1,   108,    -1,    -1,   111,    -1,    72,    73,    74,
+       75,    76,    77,    78,    79,    80,    81,    -1,    83,    -1,
+       -1,    -1,    -1,    88,    89,    -1,    91,    92,    93,    -1,
+       -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   151,    -1,    -1,   154,    -1,
+       -1,    -1,    -1,   159,   160,   161,   162,   163,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,   131,   132,   133,    -1,
+       -1,    -1,    -1,   179,   180,    -1,    -1,    -1,   184,    -1,
+       -1,    -1,    -1,   189,    -1,     3,     4,    -1,   194,    -1,
+      196,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
+       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+       28,    29,    30,    31,    32,    33,    34,    35,    36,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,    46,    47,
+       -1,    49,   197,    -1,    -1,    12,    13,    -1,    -1,    -1,
+       -1,    -1,    60,    61,    62,    -1,    -1,    -1,    -1,    -1,
+       68,    -1,    -1,    -1,    72,    -1,    -1,    75,    -1,    -1,
+       78,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    92,    -1,    -1,    -1,    -1,    -1,
+       -1,    99,   100,   101,   102,   103,    -1,    -1,    -1,    -1,
+      108,    -1,    -1,   111,    -1,    72,    73,    74,    75,    76,
+       77,    78,    79,    80,    81,    -1,    83,    -1,    -1,    -1,
+       -1,    88,    89,    -1,    91,    92,    93,    -1,    -1,    -1,
+       97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   151,    -1,    -1,   154,    -1,    -1,    -1,
+       -1,   159,   160,   161,   162,   163,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,   131,   132,   133,    -1,    -1,    -1,
+       -1,   179,   180,    -1,    -1,    -1,   184,    -1,    -1,    -1,
+       -1,   189,    -1,     3,     4,    -1,   194,    -1,   196,     9,
+       10,    11,    -1,    -1,    14,    15,    16,    17,    18,    19,
        20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-       30,    31,    32,    33,    34,    35,    -1,    -1,    -1,    -1,
+       30,    31,    32,    33,    34,    35,    36,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    45,    46,    47,    -1,    49,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,    59,
-       60,    -1,    -1,    -1,    -1,    -1,    66,   162,   163,   164,
-      165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-      175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,   146,   189,    -1,    -1,    -1,    -1,    -1,
-      153,   154,   155,   156,   157,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   171,   172,
-       -1,    -1,    -1,   176,    -1,    -1,    -1,    -1,   181,    -1,
-       -1,   184,    -1,   186,    -1,    -1,    -1,     0,     1,    -1,
-       -1,     4,    -1,    -1,    -1,    -1,   146,    -1,    -1,    12,
-       13,    -1,    -1,   153,   154,   155,   156,   157,    -1,    -1,
+      197,    -1,    -1,    12,    13,    -1,    -1,    -1,    -1,    -1,
+       60,    61,    62,    -1,    -1,    -1,    -1,    -1,    68,    -1,
+       -1,    -1,    72,    -1,    -1,    75,    -1,    -1,    78,    -1,
+       80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    92,    -1,    -1,    -1,    -1,    -1,    -1,    99,
+      100,   101,   102,   103,    -1,    -1,    -1,    -1,   108,    -1,
+       -1,   111,    -1,    72,    73,    74,    75,    76,    77,    78,
+       79,    80,    81,    -1,    83,    -1,    -1,    -1,    -1,    88,
+       89,    -1,    91,    92,    93,    -1,    -1,    -1,    97,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
++<<<<<<< HEAD
 +      -1,   171,   172,    -1,    37,    38,   176,    -1,    -1,    -1,
 +      -1,   181,    -1,    -1,    -1,    -1,   186,    50,    51,    52,
 +      -1,    -1,    55,    -1,    57,    -1,    -1,    -1,    61,    62,
 +      -1,    64,    65,    -1,    -1,    68,    69,    70,    71,    72,
 +      73,    74,    75,    76,    77,    -1,    79,    80,    81,    82,
 +      83,    84,    85,    86,    87,    88,    89,    90,    -1,    92,
 +      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
 +     103,   104,   105,   106,   107,   108,    -1,    -1,    -1,   112,
 +     113,   114,    -1,    -1,    -1,    -1,    -1,   120,     4,    -1,
 +      -1,    -1,   125,   126,   127,   128,    12,    13,   131,    -1,
 +     133,    -1,   135,   136,   137,   138,   139,   140,   141,   142,
 +     143,   144,   145,    -1,    -1,    -1,   149,   150,   151,   152,
 +      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,    50,    51,    52,    -1,    -1,    55,
 +      -1,    57,    -1,    -1,    -1,    61,    62,    -1,    64,    65,
 +      -1,    -1,    68,    69,    70,    71,    72,    73,    74,    75,
 +      76,    77,    -1,    79,    80,    81,    82,    83,    84,    85,
 +      86,    87,    88,    89,    90,    -1,    92,    93,    94,    95,
 +      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
 +     106,   107,   108,    -1,    -1,    -1,   112,   113,   114,    -1,
 +      -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,   125,
 +     126,   127,   128,    -1,    -1,   131,    -1,   133,    -1,   135,
 +     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
 +      -1,    -1,    -1,   149,   150,   151,   152,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   189,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   189,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     189,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   189,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   189,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   189,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     189,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   189,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   189,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   189,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     189,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   189,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,    -1,   189,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +      -1,    -1,   189,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     189,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,    -1,    -1,   189,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,    -1,   188,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
 +     188,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,   182,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,
 +      -1,    -1,   187,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,   187,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,    -1,    -1,    -1,   187,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,    -1,    -1,    -1,
 +     187,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,    -1,    -1,    -1,   187,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,   184,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +      -1,    -1,   184,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,   184,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,   184,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,   184,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
 +     180,    -1,    -1,    -1,   184,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,    -1,    -1,   184,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,
 +     184,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,    -1,    -1,   184,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,    -1,    -1,   184,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,   184,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +      -1,    -1,   184,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,    -1,    -1,   184,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,    -1,    -1,   184,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,    -1,
 +      -1,   184,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
 +     180,    -1,   182,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,   182,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,   182,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +     182,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,   182,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
 +     180,    -1,   182,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,   182,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,   182,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +     182,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,   182,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
 +     180,    -1,   182,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,   182,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,   182,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,
 +     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
 +     175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,   163,
 +     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
 +     174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,   162,
 +     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
 +     173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,   182,
 +     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
 +     172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,    -1,
 +     182,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,   180,
 +      -1,   182,   162,   163,   164,   165,   166,   167,   168,   169,
 +     170,   171,   172,   173,   174,   175,    -1,    -1,    -1,    -1,
 +     180,    -1,   182,   162,   163,   164,   165,   166,   167,   168,
 +     169,   170,   171,   172,   173,   174,   175,    -1,    -1,    -1,
 +      -1,   180,    -1,   182,   162,   163,   164,   165,   166,   167,
 +     168,   169,   170,   171,   172,   173,   174,   175,    -1,    -1,
 +      -1,    -1,   180,    -1,   182,   162,   163,   164,   165,   166,
 +     167,   168,   169,   170,   171,   172,   173,   174,   175,    -1,
 +      -1,    -1,    -1,   180,    -1,   182,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +      -1,    -1,    -1,    -1,   180
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+       -1,   151,    -1,    -1,   154,    -1,    -1,    -1,    -1,   159,
+      160,   161,   162,   163,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,   131,   132,   133,    -1,    -1,    -1,    -1,   179,
+      180,    -1,    -1,    -1,   184,    -1,    -1,    -1,    -1,   189,
+       -1,     3,     4,    -1,   194,    -1,   196,     9,    10,    11,
+       -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
+       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+       32,    33,    34,    35,    36,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    45,    46,    47,    -1,    49,   197,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,
+       62,    -1,    -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,
+       72,    -1,    -1,    75,    -1,    -1,    78,    -1,    80,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       92,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,   101,
+      102,   103,    -1,    -1,    -1,    -1,   108,    -1,    -1,   111,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   151,
+       -1,    -1,   154,    -1,    -1,    -1,    -1,   159,   160,   161,
+      162,   163,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,   179,   180,    -1,
+      188,    -1,   184,    -1,    -1,    -1,    -1,   189,   196,     3,
+        4,    -1,   194,    -1,   196,     9,    10,    11,    -1,    -1,
+       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+       34,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    45,    46,    47,    -1,    49,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    62,    -1,
+       -1,    -1,    -1,    -1,    68,    -1,    -1,    -1,    72,    -1,
+       -1,    75,    -1,    -1,    78,    -1,    80,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    -1,
+       -1,    -1,    -1,    -1,    -1,    99,   100,   101,   102,   103,
+       -1,    -1,    -1,    -1,   108,    -1,    -1,   111,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   151,    -1,    -1,
+      154,    -1,    -1,    -1,    -1,   159,   160,   161,   162,   163,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,   179,   180,    -1,   188,    -1,
+      184,    -1,    -1,    -1,    -1,   189,   196,     3,     4,    -1,
+      194,    -1,   196,     9,    10,    11,    -1,    -1,    14,    15,
+       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+       36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
+       46,    47,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    60,    61,    62,    -1,    -1,    -1,
+       -1,    -1,    68,    -1,    -1,    -1,    72,    -1,    -1,    75,
+       -1,    -1,    78,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    92,    -1,    -1,    -1,
+       -1,    -1,    -1,    99,   100,   101,   102,   103,    -1,    -1,
+       -1,    -1,   108,    -1,    -1,   111,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   197,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   151,    -1,    -1,   154,    -1,
+       -1,    -1,    -1,   159,   160,   161,   162,   163,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,   179,   180,    -1,   188,    -1,   184,    -1,
+       -1,    -1,    -1,   189,   196,     3,     4,     5,   194,    -1,
+      196,     9,    10,    11,    -1,    -1,    14,    15,    16,    17,
+       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+       28,    29,    30,    31,    32,    33,    34,    35,    -1,    -1,
+       -1,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+       48,    49,    -1,    -1,    -1,    53,    54,    55,    -1,    -1,
+       58,    -1,    60,    61,    62,    -1,    -1,    -1,    -1,    -1,
+       68,    69,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,    -1,    -1,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,   151,   152,   153,   154,   197,    -1,    -1,
+       -1,   159,   160,   161,   162,   163,   164,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,   179,   180,    -1,    -1,   188,   184,     3,     4,    -1,
+       -1,   189,   195,     9,    10,    11,   194,    -1,    14,    15,
+       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+       36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
+       46,    47,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    60,    61,    62,    -1,    -1,    -1,
+       -1,    -1,    68,    -1,    -1,    -1,    72,    -1,    -1,    75,
+       -1,    -1,    78,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    92,    -1,    -1,    -1,
+       -1,    -1,    -1,    99,   100,   101,   102,   103,    -1,    -1,
+       -1,    -1,   108,    -1,    -1,   111,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   197,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   151,    -1,    -1,   154,    -1,
+       -1,    -1,    -1,   159,   160,   161,   162,   163,    -1,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,   179,   180,    -1,    -1,   188,   184,     3,
+        4,    -1,    -1,   189,   195,     9,    10,    11,   194,    -1,
+       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+       34,    35,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    45,    46,    47,    -1,    49,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    62,    -1,
+       -1,    -1,    -1,    -1,    68,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,   197,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      197,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,     0,     1,    -1,    -1,     4,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    12,    13,    -1,   151,    -1,    -1,
+      154,    -1,    -1,    -1,    -1,   159,   160,   161,   162,   163,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+       38,    -1,    -1,    -1,    -1,   179,   180,    -1,    -1,    -1,
+      184,    -1,    50,    51,    52,   189,    -1,    -1,    56,    57,
+      194,    59,    -1,    -1,    -1,    63,    64,    -1,    66,    67,
+       -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+       78,    79,    80,    81,    -1,    83,    84,    85,    86,    87,
+       88,    89,    90,    91,    92,    93,    94,    -1,    96,    97,
+       98,    99,   100,   101,   102,   103,   104,    -1,   106,   107,
+      108,   109,   110,   111,   112,   113,    -1,    -1,    -1,   117,
+      118,   119,     4,    -1,    -1,    -1,    -1,   125,    -1,    -1,
+       12,    13,   130,   131,   132,   133,    -1,    -1,   136,    -1,
+      138,    -1,   140,   141,   142,   143,   144,   145,   146,   147,
+      148,   149,   150,    -1,    -1,    37,    38,   155,   156,   157,
+      158,    -1,    -1,    -1,    -1,    -1,    -1,   165,    50,    51,
+       52,    -1,    -1,    -1,    56,    57,    -1,    59,    -1,    -1,
+       -1,    63,    64,    -1,    66,    67,    -1,    -1,    70,    71,
+       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+       -1,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+       92,    93,    94,    -1,    96,    97,    98,    99,   100,   101,
+      102,   103,   104,    -1,   106,   107,   108,   109,   110,   111,
+      112,   113,    -1,    -1,    -1,   117,   118,   119,    -1,    -1,
+       -1,    -1,    -1,   125,    -1,    -1,    -1,    -1,   130,   131,
+      132,   133,    -1,    -1,   136,    -1,   138,    -1,   140,   141,
+      142,   143,   144,   145,   146,   147,   148,   149,   150,    -1,
+       -1,    -1,    -1,   155,   156,   157,   158,    -1,    -1,    -1,
+       -1,    -1,    -1,   165,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,   197,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   197,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   197,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,   197,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   197,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   197,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,   197,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   197,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,   197,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,   197,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,   197,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,    -1,    -1,    -1,   195,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,
+       -1,   195,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,    -1,    -1,    -1,   195,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+       -1,    -1,    -1,   195,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      190,    -1,   192,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,    -1,    -1,   192,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,   192,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,
+       -1,   192,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,   192,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,    -1,    -1,   192,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,
+      192,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,    -1,    -1,   192,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,    -1,    -1,   192,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,    -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,   192,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+       -1,    -1,   192,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,    -1,    -1,   192,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,    -1,    -1,   192,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,    -1,
+       -1,   192,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,    -1,    -1,   192,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,    -1,    -1,   192,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      190,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,   190,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,   190,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,   190,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,   190,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      190,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,   190,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,   190,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,   190,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,   190,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      190,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,   190,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,   190,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188,    -1,   190,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,    -1,    -1,
+       -1,    -1,   188,    -1,   190,   170,   171,   172,   173,   174,
+      175,   176,   177,   178,   179,   180,   181,   182,   183,    -1,
+       -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,   173,
+      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+       -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,   172,
+      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+      183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,   171,
+      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+      182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,   170,
+      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+      181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,   190,
+      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+      180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,    -1,
+      190,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+      179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,   188,
+       -1,   190,   170,   171,   172,   173,   174,   175,   176,   177,
+      178,   179,   180,   181,   182,   183,    -1,    -1,    -1,    -1,
+      188,    -1,   190,   170,   171,   172,   173,   174,   175,   176,
+      177,   178,   179,   180,   181,   182,   183,    -1,    -1,    -1,
+       -1,   188
++>>>>>>> upstream/2.10.1+dfsg1
  };
  
- /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-    symbol of state STATE-NUM.  */
+   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+      symbol of state STATE-NUM.  */
  static const yytype_uint16 yystos[] =
  {
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +       0,     1,   188,   189,     6,     0,     4,    12,    13,    37,
 +      38,    48,    49,    50,    53,    57,    58,    60,    61,    64,
 +      65,    66,    67,    68,    69,    70,    71,    72,    73,    75,
 +      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
 +      86,    88,    89,    90,    91,    92,    93,    94,    95,    96,
 +      97,    98,    99,   100,   101,   102,   103,   104,   108,   109,
 +     110,   116,   121,   122,   123,   124,   127,   129,   131,   132,
 +     133,   134,   135,   136,   137,   138,   139,   140,   141,   145,
 +     146,   147,   148,   190,   192,   193,   213,   227,   232,   235,
 +     236,   237,   238,   239,   240,   241,   261,   262,   263,   264,
 +     282,   283,     3,     4,     5,     9,    10,    11,    14,    15,
 +      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
 +      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
 +      39,    40,    41,    42,    43,    44,    45,    46,    47,    51,
 +      52,    54,    55,    56,    62,    63,   136,   142,   143,   144,
 +     149,   150,   151,   152,   153,   167,   168,   172,   177,   179,
 +     181,   182,   184,   186,   211,   265,   266,   278,   279,   282,
 +     283,    13,    70,   177,   177,     6,   184,     6,     6,     6,
 +       6,     6,   179,   179,   177,   184,   177,   177,     4,   177,
 +     184,   177,   177,     4,   184,   177,   177,    74,    70,    70,
 +       6,   184,    64,    67,    70,    70,    70,    67,    70,    72,
 +      72,    64,    67,    70,    72,    67,    70,    72,    67,    70,
 +     177,    67,   127,   140,   141,   184,   167,   168,   177,   184,
 +     268,   269,   268,   184,    64,    67,    70,   184,   268,     4,
 +      64,    68,    80,    70,    72,    70,    67,     4,   136,   184,
 +       4,     6,    64,    67,    70,    67,    70,     4,     4,     4,
 +       4,     5,    36,    64,    67,    70,    72,    84,   168,   177,
 +     184,   232,   241,   265,   271,   272,   273,   283,     4,   177,
 +     177,   177,     4,   184,   275,     4,   177,   177,     6,     6,
 +     179,     4,     4,     5,   184,     5,   184,     4,   265,     6,
 +     177,   184,   177,   179,   186,     7,   154,   155,   156,   157,
 +     174,   175,   209,   210,     4,   179,   181,   177,   179,   211,
 +     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
 +     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
 +     211,   211,   211,   211,   177,   177,   177,   177,   177,   177,
 +     211,   211,     7,   177,   177,   177,   177,   177,   265,   265,
 +     265,   265,   180,   265,     4,   127,   128,     4,   282,   283,
 +       4,   232,   233,   234,   184,   184,     6,   158,   159,   160,
 +     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
 +     171,   176,   184,     6,   179,   210,     6,   265,     4,   278,
 +     279,   283,   278,   265,   215,   218,   265,   168,   265,   273,
 +     274,   265,   265,   177,   265,   274,   265,   265,   177,   274,
 +     265,   265,   271,   177,   184,   274,   272,   272,   272,   177,
 +     177,   272,   272,   272,   177,   228,   229,   230,   231,   177,
 +     177,   177,   271,   265,     4,   271,   275,   184,   184,   268,
 +     268,   268,   265,   265,   167,   168,   184,   184,   268,   184,
 +     184,   184,   167,   168,   177,   234,   268,   184,   177,   184,
 +     177,   177,   177,   272,   272,   271,   177,     4,     6,   179,
 +     179,   234,     6,   184,   184,   184,   272,   272,   179,   179,
 +     179,   179,   181,   211,   179,     5,   184,     5,     5,     5,
 +      64,    67,    70,    72,   184,   265,   273,   265,   185,   274,
 +       8,   169,     6,     6,   265,   265,   265,   181,   265,   184,
 +     130,   265,   265,   265,     6,     6,   234,     6,   234,   179,
 +       6,   271,   271,   184,   265,   184,   279,   271,     6,   179,
 +     265,     4,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   278,   281,   278,   278,   278,   278,
 +     278,   278,   278,   281,   265,   279,   265,   278,   278,   278,
 +     283,   279,   178,     7,   209,   180,     7,   209,   210,   181,
 +       7,   179,   185,    64,    67,    70,    72,   227,   265,   274,
 +     265,   265,   265,   265,   265,   265,   265,   265,   265,   265,
 +     265,   265,   265,   265,   265,   194,   265,     6,   179,   181,
 +     178,   183,   178,   183,   183,   180,   183,   214,   180,   214,
 +     178,   169,   183,   185,   178,   178,   265,   178,   185,   178,
 +     178,   265,   185,   178,   178,     7,   265,   265,   185,     6,
 +       6,     6,   265,   265,     7,     7,   259,   259,   265,   177,
 +     177,   177,   177,   265,   265,   265,     7,   184,   178,     6,
 +     184,   234,   234,   183,   183,   183,   268,   268,   233,   233,
 +     183,   265,   265,   265,   265,   245,   183,   234,   265,   265,
 +     265,   265,   265,     7,   260,     6,     7,   265,     6,   265,
 +     265,   185,   274,   274,   274,     6,     6,   265,   265,   265,
 +     265,     4,   178,   180,   184,   212,     4,   265,   184,   184,
 +     184,   184,   274,   178,   185,   265,   184,   265,   273,   178,
 +     178,   178,   127,   183,   234,   184,     8,   178,   180,   185,
 +     185,   178,   183,   185,   274,   180,   265,     6,     6,   265,
 +     180,   210,   212,   212,   212,   212,   212,   212,   212,   212,
 +     212,   212,   212,   183,   212,   212,   212,   212,   212,   212,
 +     212,   183,   183,   183,   183,   212,   183,   212,   183,   178,
 +     178,   183,   183,   183,   178,   267,   280,     6,   183,   178,
 +     183,   178,   178,   209,   271,   181,   209,   210,   279,   265,
 +       6,     4,     4,   184,   276,   180,   184,   184,   184,   184,
 +     185,   185,     8,     4,   117,   118,   119,   120,   185,   197,
 +     201,   204,   206,   207,   180,   265,     4,     6,   164,   191,
 +     274,     6,   274,   265,     6,   283,     6,   278,     7,   265,
 +     273,   130,     7,     7,   178,     7,   130,     7,     7,   178,
 +     130,     7,     7,   265,   178,   185,   184,   178,   178,   265,
 +     271,     4,   258,     6,   178,   224,   265,   279,   224,   224,
 +     224,   178,   178,   178,   271,   274,   181,   234,   185,   185,
 +     268,   265,   265,   185,   185,   265,   268,   183,   183,   183,
 +      87,    97,   105,   106,   107,   111,   112,   113,   114,   255,
 +     256,   268,   185,   242,   178,   185,   178,   178,   178,   265,
 +       6,   265,   178,   180,   180,   185,   185,   185,   180,   180,
 +     183,   180,   274,   180,   185,   274,   274,   274,   274,   185,
 +       8,   274,     7,     7,     7,   181,   265,   185,   265,   265,
 +       7,   181,   184,   271,     6,   185,   209,   210,   185,   180,
 +     181,   210,   278,   265,   265,   265,   265,   278,   274,   278,
 +     278,   278,   278,   220,   222,   265,   278,   265,     6,     4,
 +     127,   128,   265,     6,     6,     6,     7,   179,   275,   277,
 +       6,   274,   274,   274,   274,   212,   265,   198,   177,   177,
 +     184,   208,     6,   210,   180,   164,   278,   178,   178,   183,
 +       7,   268,    70,    72,   271,   271,     7,   271,    70,    72,
 +     271,   271,     7,    72,   271,   271,     6,     7,     7,   274,
 +       7,     7,    87,   257,     6,     7,   178,   178,   178,   178,
 +       7,     7,     7,     6,   185,     4,   185,   183,   183,   183,
 +     185,   185,   268,   268,   268,     4,     6,   184,     6,   177,
 +       6,   115,     6,   115,     6,   115,     6,   115,   185,   256,
 +     183,   255,     7,     6,     7,     7,     7,     6,   184,     6,
 +       6,     6,    70,   265,     6,     6,   265,   181,   185,   185,
 +     185,   185,   185,   265,   185,   271,   271,   271,     4,   183,
 +       8,     8,   178,     4,     4,   271,   185,   178,   265,     6,
 +       6,     4,     6,   212,   212,   212,   212,   212,   212,   183,
 +     178,   178,   183,   212,   221,   183,   212,   223,   178,   178,
 +       6,     7,   209,   210,   181,     7,     6,   275,   265,   183,
 +     185,   185,   185,   185,   185,   209,   177,   265,   265,   270,
 +     271,   184,   181,     6,     6,   191,     6,   265,   184,   265,
 +     279,     6,   184,   184,    80,   226,   226,   271,     6,   184,
 +     184,     6,     6,   271,   184,     6,     6,     5,   271,   185,
 +     271,   271,     4,     6,   271,     7,     7,     7,     7,   271,
 +     271,   271,     7,     6,     7,   265,   265,   265,   184,   184,
 +     183,   185,   183,   185,   183,   185,   179,   265,   271,   265,
 +       6,     6,     6,     6,   265,   268,   185,     5,   184,   271,
 +     184,   184,   184,   271,   274,   184,     6,   180,     4,   212,
 +       6,     6,   126,   265,   265,   265,     6,     6,     7,   183,
 +       6,   209,     6,   210,   278,     4,     4,   279,   265,     6,
 +       4,   276,     6,   180,   275,     6,     6,     6,     6,   271,
 +     195,   265,   183,   183,   183,   185,   196,   265,     4,   278,
 +     183,   265,   279,   265,   265,   268,     6,     6,     6,   265,
 +     265,     6,   265,     5,     6,   184,     6,   130,   225,   265,
 +       6,   271,   271,   271,   271,     6,     4,     6,     6,   265,
 +     265,   279,   185,   178,   183,   185,   233,   233,   268,     6,
 +     246,   268,     6,   247,   268,     6,   248,   265,   185,   183,
 +     178,   185,   183,     6,   168,   268,     6,   270,   268,   268,
 +       6,   185,   265,     6,   271,   183,   185,     8,   185,   178,
 +     184,   265,   279,   271,   271,   178,   184,   271,   279,   184,
 +     265,   279,     6,     6,     7,     6,   181,     6,   178,   183,
 +     265,   265,   271,   184,   183,   185,     6,   265,   216,   217,
 +     185,   185,   185,   185,   185,     5,   270,    68,     6,     6,
 +       6,     6,     6,   184,   184,     6,     6,   184,   265,   185,
 +     185,   183,   184,   183,   184,   183,   184,   180,     6,   271,
 +       7,   184,   265,   183,   185,   183,   183,     6,   185,   125,
 +     265,   265,   274,     6,     6,   185,     6,   219,   265,   281,
 +     275,   128,   199,   265,   183,   183,   270,   265,     6,   183,
 +     220,   222,     6,     6,     6,     6,     6,     6,   185,   184,
 +     270,   274,   233,   183,   185,   265,   268,   255,   265,   268,
 +     255,   265,   268,   255,     6,   183,   185,   271,   234,   185,
 +     268,     6,   274,   268,   265,   185,   185,   185,     6,   183,
 +     185,     7,   185,     6,   184,   265,   265,   185,   265,   185,
 +     185,   184,   265,   185,   185,   185,   265,   185,   183,   185,
 +     185,   183,   185,   185,   183,   185,   271,     6,    87,   185,
 +     243,   184,   183,   185,   183,     6,     6,   265,   279,   196,
 +     178,   183,     6,   184,   183,   265,   185,     6,     6,   185,
 +       6,   249,   265,     6,     6,   250,   265,     6,     6,   251,
 +     265,     6,   185,   265,   255,   234,   274,     6,   268,   274,
 +       7,   185,   202,   265,   270,   265,   183,   184,   185,   184,
 +     185,   184,   185,     6,     6,   185,   185,   244,   185,   183,
 +     185,   279,     6,   184,   178,   185,   185,   265,   255,     6,
 +     252,   255,     6,   253,   255,     6,   254,   255,     6,   274,
 +       6,   200,   278,   205,   184,     6,   185,   185,   184,   185,
 +     184,   185,   184,   185,   185,   183,   185,   184,   270,     6,
 +       6,   255,     6,   255,     6,   255,     6,   278,     6,   203,
 +     278,   185,   185,   185,   185,   183,   185,     6,     6,     6,
 +       6,   278,     6
 +=======
 +       0,     1,   192,   193,     6,     0,     4,    12,    13,    37,
 +      38,    50,    51,    52,    55,    57,    61,    62,    64,    65,
 +      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
 +      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
 +      89,    90,    92,    93,    94,    95,    96,    97,    98,    99,
 +     100,   101,   102,   103,   104,   105,   106,   107,   108,   112,
 +     113,   114,   120,   125,   126,   127,   128,   131,   133,   135,
 +     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
 +     149,   150,   151,   152,   194,   196,   197,   217,   234,   235,
 +     238,   239,   240,   241,   242,   243,   244,   265,   266,   267,
 +     268,   286,   287,     3,     4,     5,     9,    10,    11,    14,
 +      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
 +      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
 +      35,    39,    40,    41,    42,    43,    44,    45,    46,    47,
 +      48,    49,    53,    54,    56,    58,    59,    60,    66,    67,
 +     140,   146,   147,   148,   153,   154,   155,   156,   157,   171,
 +     172,   176,   181,   183,   185,   186,   188,   190,   215,   269,
 +     270,   282,   283,   286,   287,    13,    74,   181,   181,     6,
 +     188,     6,     6,     6,   181,     6,     6,   183,   183,   181,
 +     188,   181,   181,     4,   181,   188,   181,   181,     4,   188,
 +     181,   181,    78,    74,    74,     6,   188,    68,    71,    74,
 +      74,    74,    71,    74,    76,    76,    68,    71,    74,    76,
 +      71,    74,    76,    71,    74,   181,    71,   131,   144,   145,
 +     188,   171,   172,   181,   188,   272,   273,   272,   188,    68,
 +      71,    74,   188,   272,     4,    68,    72,    84,    74,    76,
 +      74,    71,     4,   140,   188,     4,     6,    68,    71,    74,
 +      71,    74,     4,     4,     4,     4,     5,    36,    68,    71,
 +      74,    76,    88,   172,   181,   188,   235,   244,   269,   275,
 +     276,   277,   286,   287,     4,   181,   181,   181,     4,   188,
 +     279,     4,   181,   181,     6,     6,   183,     4,   286,   287,
 +       4,     5,   188,     5,   188,     4,   269,     6,   181,   188,
 +     181,   183,   190,   215,     7,   158,   159,   160,   161,   178,
 +     179,   213,   214,     4,   183,   185,   183,   215,   215,   215,
 +     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
 +     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
 +     215,   215,   181,   181,   181,   181,   181,   181,   215,   181,
 +     215,   215,   215,     7,   181,   181,   181,   181,   181,   269,
 +     269,   269,   269,   184,   269,     4,   131,   132,   287,     4,
 +     235,   236,   237,   188,   188,     6,   162,   163,   164,   165,
 +     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
 +     180,   188,     6,   183,   214,     6,   269,     4,   282,   283,
 +     287,   282,   269,   282,   285,   219,   222,   269,   172,   269,
 +     277,   278,   269,   269,   181,   269,   278,   269,   269,   181,
 +     278,   269,   269,   275,   181,   188,   278,   276,   276,   276,
 +     181,   181,   276,   276,   276,   181,   181,   181,   181,   181,
 +     181,   181,   181,   275,   269,     4,   275,   279,   188,   188,
 +     272,   272,   272,   269,   269,   171,   172,   188,   188,   272,
 +     188,   188,   188,   171,   172,   181,   237,   272,   188,   181,
 +     188,   181,   181,   181,   276,   276,   275,   181,     4,     6,
 +     183,   183,   237,     6,   188,   188,   188,   276,   276,   183,
 +     183,   183,   183,   185,   215,   183,     5,   134,   188,     5,
 +     134,     5,   134,     5,   134,    68,    71,    74,    76,   188,
 +     269,   277,   269,   189,   278,     8,   173,     6,   183,   215,
 +       6,   269,   269,   269,   185,   269,   188,   134,   269,   269,
 +     269,     6,     6,   237,     6,   237,   183,     6,   275,   275,
 +     184,   269,   188,   188,   283,   275,     6,   183,   269,     4,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   285,   282,   285,   282,   282,   282,   275,   282,
 +     282,   269,   285,   282,   269,   283,   269,   282,   282,   282,
 +     287,   283,   182,     7,   213,   184,     7,   213,   214,   185,
 +       7,   183,   189,    68,    71,    74,    76,   234,   269,   278,
 +     269,   269,   269,   269,   269,   269,   269,   269,   269,   269,
 +     269,   269,   269,   269,   269,   198,   269,     6,   183,   185,
 +     182,   187,   182,   187,   187,   182,   187,   184,   187,   218,
 +     184,   218,   182,   173,   187,   189,   182,   182,   269,   182,
 +     189,   182,   182,   269,   189,   182,   182,     7,   269,   269,
 +     189,     6,     6,     6,   269,   269,     7,     7,   262,   262,
 +     269,   228,   269,   283,   229,   269,   283,   230,   269,   283,
 +     231,   269,   283,   269,   269,   269,     7,   188,   182,     6,
 +     188,   237,   237,   187,   187,   187,   272,   272,   236,   236,
 +     187,   269,   269,   269,   269,   248,   187,   237,   269,   269,
 +     269,   269,   269,     7,   263,     6,     7,   269,     6,   269,
 +     269,   189,   278,   278,   278,     6,     6,   269,   269,   269,
 +     269,     4,   182,   184,   188,   216,   287,    50,   269,    50,
 +      50,    50,     5,   188,     5,   188,     5,   188,     5,   188,
 +     278,   182,   189,   269,   188,   269,   277,   188,   216,   182,
 +     182,   182,   131,   187,   237,   188,     8,   182,   184,   189,
 +     189,   182,   187,   189,   213,   184,   269,   278,     6,     6,
 +     269,   184,   214,   216,   216,   216,   216,   216,   216,   216,
 +     216,   216,   216,   216,   187,   216,   216,   216,   216,   216,
 +     216,   216,   187,   187,   187,   216,   187,   216,   216,   182,
 +     182,   187,   187,   187,   187,   187,   182,   216,   271,   284,
 +       6,   187,   182,   187,   182,   182,   213,   275,   185,   213,
 +     214,   283,   269,     6,     4,     4,   188,   280,   184,   188,
 +     188,   188,   188,   189,   189,     8,     4,   121,   122,   123,
 +     124,   189,   201,   205,   208,   210,   211,   184,   269,     4,
 +       6,   168,   195,   278,     6,   278,   269,     6,   282,     6,
 +     287,     6,   282,     7,   269,   277,   134,     7,     7,   182,
 +       7,   134,     7,     7,   182,   134,     7,     7,   269,   182,
 +     189,   188,   182,   182,   269,   275,     4,   261,     6,   182,
 +     182,   182,   182,   182,   182,   182,   182,   275,   278,   185,
 +     237,   189,   189,   272,   269,   269,   189,   189,   269,   272,
 +     187,   187,   187,    91,   101,   109,   110,   111,   115,   116,
 +     117,   118,   258,   259,   272,   189,   245,   182,   189,   182,
 +     182,   182,   269,     6,   269,   182,   184,   184,   189,   189,
 +     189,   184,   184,   187,   184,   278,   184,   188,   189,   188,
 +     188,   188,   278,   278,   278,   278,   189,     8,   278,   278,
 +       7,     7,     7,   185,   269,   189,   269,   269,     7,   185,
 +     188,   275,     6,   275,   213,   214,   189,   189,   184,   185,
 +     214,   282,   269,   269,   269,   269,   278,   282,   275,   282,
 +     282,   283,   224,   226,   269,   282,   269,     6,     4,   131,
 +     132,   269,     6,     6,     6,     7,   183,   279,   281,     6,
 +     278,   278,   278,   278,   216,   269,   202,   181,   181,   188,
 +     212,     6,   214,   184,   168,   282,   182,   182,   187,     7,
 +     272,    74,    76,   275,   275,     7,   275,    74,    76,   275,
 +     275,     7,    76,   275,   275,     6,     7,     7,   278,     7,
 +       7,    91,   260,     6,     7,   213,   213,   213,   213,     7,
 +       7,     7,     6,   189,     4,   189,   187,   187,   187,   189,
 +     189,   272,   272,   272,     4,     6,   188,     6,   181,     6,
 +     119,     6,   119,     6,   119,     6,   119,   189,   259,   187,
 +     258,     7,     6,     7,     7,     7,     6,   188,     6,     6,
 +       6,    74,   269,     6,     6,   269,   185,   189,   269,   269,
 +     269,   269,   189,   189,   189,   189,   269,   189,   189,   275,
 +     275,   275,     4,   187,     8,     8,   182,     4,     4,   275,
 +     189,     6,   269,     6,   216,     6,     4,     6,   216,   216,
 +     216,   216,   216,   187,   182,   182,   182,   187,   187,   216,
 +     225,   187,   216,   227,   182,   182,     6,     7,   213,   214,
 +     185,     7,     6,   279,   269,   187,   189,   189,   189,   189,
 +     189,   213,   181,   269,   269,   274,   275,   188,   185,     6,
 +       6,   195,     6,   269,   188,   269,   283,     6,   188,   188,
 +      84,   233,   233,   275,     6,   188,   188,     6,     6,   275,
 +     188,     6,     6,     5,   275,   189,   275,   275,     4,     6,
 +     275,   275,   275,   275,   275,   275,   275,   275,     7,     6,
 +       7,   269,   269,   269,   188,   188,   187,   189,   187,   189,
 +     187,   189,   183,   269,   275,   269,     6,     6,     6,     6,
 +     269,   272,   189,     5,   188,   275,   188,   188,   188,   275,
 +     278,   188,     6,   184,     4,   216,   187,   187,   187,   187,
 +     216,     6,     6,   130,   269,   269,   269,     6,     6,     7,
 +     187,     6,     6,   213,   214,   282,   283,     4,     4,   283,
 +     269,     6,     4,   280,     6,   184,   279,     6,     6,     6,
 +       6,   275,   199,   269,   187,   187,   187,   189,   200,   269,
 +       4,   282,   187,   269,   283,   269,   269,   272,     6,     6,
 +       6,   269,   269,     6,   269,     5,     6,   188,     6,   134,
 +     232,   269,     6,     6,     6,     6,     6,     6,     4,     6,
 +       6,   269,   269,   283,   189,   182,   187,   189,   236,   236,
 +     272,     6,   249,   272,     6,   250,   272,     6,   251,   269,
 +     189,   187,   182,   189,   187,     6,   172,   272,     6,   274,
 +     272,   272,     6,   189,   269,     6,   269,   269,   269,   269,
 +     275,   187,   189,     8,   189,   182,   188,   269,   283,   275,
 +     275,   182,   216,   188,   275,   283,   188,   269,   283,     6,
 +       6,     7,     6,   185,     6,   182,   187,   269,   269,   275,
 +     188,   187,   189,     6,   269,   220,   221,   189,   189,   189,
 +     189,   189,     5,   274,    72,     6,   188,   188,     6,     6,
 +     188,   269,   189,   189,   187,   188,   187,   188,   187,   188,
 +     184,     6,   275,     7,   188,   269,   187,   189,   187,   187,
 +       6,   189,   187,   187,   187,   187,   129,   269,   269,   278,
 +       6,     6,   189,     6,   223,   269,   285,   279,   132,   203,
 +     269,   187,   187,   274,   269,     6,   187,   224,   226,     6,
 +       6,     6,     6,     6,     6,   189,   188,   274,   278,   236,
 +     187,   189,   269,   272,   258,   269,   272,   258,   269,   272,
 +     258,     6,   187,   189,   275,   237,   189,   272,     6,   278,
 +     272,   269,   269,   269,   269,   269,   189,   189,   189,     6,
 +     187,   189,     7,   189,     6,   188,   269,   269,   189,   269,
 +     189,   189,   188,   269,   189,   189,   189,   269,   189,   187,
 +     189,   189,   187,   189,   189,   187,   189,   275,     6,    91,
 +     189,   246,   188,   187,   189,   187,   187,   187,   187,   187,
 +       6,     6,   269,   283,   200,   182,   187,     6,   188,   187,
 +     269,   189,     6,    91,   264,   189,     6,   252,   269,     6,
 +       6,   253,   269,     6,     6,   254,   269,     6,   189,   269,
 +     258,   237,   278,     6,   272,   278,   269,   269,   269,   269,
 +       7,   189,   206,   269,   274,   269,   187,   275,     6,   188,
 +     189,   188,   189,   188,   189,     6,     6,   189,   189,   247,
 +     189,   187,   189,   187,   187,   187,   187,   283,     6,   188,
 +     182,   189,   189,   269,   258,     6,   255,   258,     6,   256,
 +     258,     6,   257,   258,     6,   278,     6,   269,   269,   269,
 +     269,   204,   282,   209,   188,     6,   189,   189,   188,   189,
 +     188,   189,   188,   189,   189,   187,   187,   187,   187,   187,
 +     189,   188,   274,     6,     6,   258,     6,   258,     6,   258,
 +       6,   269,   269,   269,   269,   282,     6,   207,   282,   189,
 +     189,   189,   189,   189,   189,   189,   189,   187,   189,     6,
 +       6,     6,     6,   282,     6
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        0,     1,   200,   201,     6,     0,     4,    12,    13,    37,
+       38,    50,    51,    52,    56,    57,    59,    63,    64,    66,
+       67,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+       79,    80,    81,    83,    84,    85,    86,    87,    88,    89,
+       90,    91,    92,    93,    94,    96,    97,    98,    99,   100,
+      101,   102,   103,   104,   106,   107,   108,   109,   110,   111,
+      112,   113,   117,   118,   119,   125,   130,   131,   132,   133,
+      136,   138,   140,   141,   142,   143,   144,   145,   146,   147,
+      148,   149,   150,   155,   156,   157,   158,   165,   202,   204,
+      205,   225,   242,   243,   246,   247,   248,   249,   250,   251,
+      252,   253,   274,   275,   276,   277,   295,   296,     3,     4,
+        5,     9,    10,    11,    14,    15,    16,    17,    18,    19,
+       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+       30,    31,    32,    33,    34,    35,    39,    40,    41,    42,
+       43,    44,    45,    46,    47,    48,    49,    53,    54,    55,
+       58,    60,    61,    62,    68,    69,   145,   151,   152,   153,
+      154,   159,   160,   161,   162,   163,   164,   179,   180,   184,
+      189,   191,   193,   194,   196,   198,   223,   278,   279,   291,
+      292,   295,   296,    13,    78,   189,   189,     6,   196,     6,
+        6,     6,     6,   189,     6,     6,   191,   191,   189,   191,
+      223,   223,   189,   196,   189,   189,     4,   189,   196,   189,
+      189,     4,   196,   189,   189,    82,    78,    78,     6,   196,
+       72,    75,    78,    78,    78,    75,    78,    80,    80,    72,
+       75,    78,    80,    75,    78,    80,    75,    78,   189,    75,
+      136,   149,   150,   196,   179,   180,   189,   196,   281,   282,
+      281,   196,    72,    75,    78,   196,   281,     4,    72,    76,
+       88,    78,    80,    78,    75,     4,   145,   196,   295,   296,
+        4,     6,    72,    75,    78,    75,    78,     4,     4,     4,
+        4,     5,    36,    72,    75,    78,    80,    92,   180,   189,
+      196,   243,   253,   278,   284,   285,   286,   295,   296,     4,
+      189,   189,   189,     4,   196,   288,     4,   189,   189,     6,
+        6,   191,     4,   296,     4,     5,   196,     5,   196,     4,
+      278,   278,     6,   189,   196,   189,   191,   198,   223,     7,
+      166,   167,   168,   169,   185,   186,   221,   222,     4,   189,
+      191,   193,   223,   223,   223,   223,   223,   223,   223,   223,
+      223,   223,   223,   223,   223,   223,   223,   223,   223,   223,
+      223,   223,   223,   223,   223,   223,   223,   189,   189,   189,
+      189,   189,   189,   223,   189,   223,   223,   223,     7,   189,
+      189,   189,   223,   189,   189,   278,   278,   278,   278,   278,
+        4,   136,   137,   296,     4,   243,   244,   245,   196,   190,
+      192,   196,   224,     6,   170,   171,   172,   173,   174,   175,
+      176,   177,   178,   179,   180,   181,   182,   183,   188,   196,
+        6,   189,   191,   222,     6,   278,     4,   291,   292,   296,
+      291,   278,   291,   294,   227,   230,   292,   296,   278,   180,
+      278,   286,   287,   278,   278,   189,   278,   287,   278,   278,
+      189,   287,   278,   278,   284,   189,   196,   287,   285,   285,
+      285,   189,   189,   285,   285,   285,   189,   189,   189,   189,
+      189,   189,   189,   189,   196,   196,   278,     4,   284,   288,
+      196,   196,   281,   281,   281,   278,   278,   179,   180,   196,
+      196,   281,   196,   196,   196,   179,   180,   189,   245,   281,
+      196,   189,   196,   189,   189,   189,   285,   285,   284,   189,
+        4,   191,   191,   245,     6,     6,   196,   196,   196,   285,
+      285,   191,   191,   191,   189,   191,   193,   223,   191,     5,
+      139,   196,     5,   139,     5,   139,     5,   139,    72,    75,
+       78,    80,   196,   278,   286,   278,   197,   287,     8,   181,
+        6,   189,   191,   223,     6,   278,   278,   278,   193,   278,
+      196,   139,   278,   278,   278,     6,     6,   245,     6,   245,
+      191,     6,   196,   284,   284,   278,   278,   196,   196,   224,
+      292,   284,     6,   191,   278,   278,     4,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   294,
+      291,   294,   291,   291,   291,   284,   291,   291,   278,   294,
+      291,   278,   292,   278,   291,   291,   291,   291,   296,   292,
+      190,   192,     7,   221,   222,   193,     7,   223,   197,    72,
+       75,    78,    80,   242,   278,   287,     7,   221,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   278,
+      278,   278,   278,   206,   278,   278,     6,   191,   193,   190,
+      195,   190,   195,   195,   190,   195,   192,   195,   226,   192,
+      226,   195,   195,   190,   181,   195,   197,   190,   190,   278,
+      190,   197,   190,   190,   278,   197,   190,   190,     7,   278,
+      278,   197,     6,     6,     6,   278,   278,     7,     7,   271,
+      271,   278,   236,   278,   292,   237,   278,   292,   238,   278,
+      292,   239,   278,   292,   278,   278,   278,   287,   287,   196,
+      190,     6,   196,   245,   245,   195,   195,   195,   281,   281,
+      244,   244,   195,   278,   278,   278,   278,   257,   195,   245,
+      278,   278,   278,   278,   278,     7,   272,     6,     7,   278,
+        6,   278,   278,   197,   287,   287,   287,     6,     6,   278,
+      278,   278,   278,     4,   196,   224,   296,    50,   278,    50,
+       50,    50,     5,   196,     5,   196,     5,   196,     5,   196,
+      287,   190,   197,   278,   196,   278,   286,   196,   224,   190,
+      190,   190,   136,   195,   245,   196,     8,   190,   192,   197,
+      197,   245,   190,   195,   197,   190,   192,   278,   287,   221,
+        6,     6,   278,   190,   192,   222,   224,   224,   224,   224,
+      224,   224,   224,   224,   224,   224,   224,   195,   224,   224,
+      224,   224,   224,   224,   224,   195,   195,   195,   224,   195,
+      224,   224,   190,   190,   195,   195,   195,   195,   195,   190,
+      224,   280,   293,     6,   195,   190,   190,   195,   224,   190,
+      190,   221,   222,   193,   221,   222,   292,   278,     6,     4,
+        4,   196,   289,   224,   196,   196,   196,   196,   197,   197,
+      284,     8,     4,   126,   127,   128,   129,   197,   209,   213,
+      216,   218,   219,   190,   192,   278,     4,     6,   177,   203,
+      287,     6,   287,   278,     6,   291,     6,   296,     6,   291,
+      278,   292,     7,   278,   286,   139,     7,     7,   190,     7,
+      139,     7,     7,   190,   139,     7,     7,   278,   190,   197,
+      196,   190,   190,   278,   284,     4,   270,     6,   190,   190,
+      195,   190,   195,   190,   195,   190,   195,   190,   190,   190,
+      197,   197,   287,   193,   245,   197,   197,   281,   278,   278,
+      197,   197,   278,   281,   195,   195,   195,    95,   106,   114,
+      115,   116,   120,   121,   122,   123,   267,   268,   281,   197,
+      254,   190,   197,   190,   190,   190,   278,     6,   278,   190,
+      192,   192,   197,   197,   197,   192,   192,   195,   192,   287,
+      192,   196,   197,   196,   196,   196,   287,   287,   287,   287,
+      197,     8,   287,   287,     7,     7,     7,   193,   278,   197,
+      278,   278,     7,   193,   197,   196,   284,     6,   221,   222,
+      221,   222,   197,   197,   284,   192,   222,   193,   222,   291,
+      278,   278,   278,   278,   287,   291,   284,   291,   291,   292,
+      232,   234,   278,   291,   278,     6,     4,   136,   137,   278,
+        6,     6,     6,     7,   191,   288,   290,     6,   287,   287,
+      287,   287,   224,     6,   278,   210,   189,   189,   196,   220,
+        6,   222,   222,   192,   177,   291,   190,   190,   195,     7,
+      224,   224,   281,    78,    80,   284,   284,     7,   284,    78,
+       80,   284,   284,     7,    80,   284,   284,     6,     7,     7,
+      287,     7,     7,    95,   269,     6,     7,   221,   278,   221,
+      278,   221,   278,   221,   278,     7,     7,     7,     7,     7,
+      197,     4,   197,   195,   195,   195,   197,   197,   281,   281,
+      281,     4,     6,   196,     6,   189,     6,   124,     6,   124,
+        6,   124,     6,   124,   197,   268,   195,   267,     7,     6,
+        7,     7,     7,     6,   196,     6,     6,     6,    78,   278,
+        6,     6,   278,   193,   197,   278,   278,   278,   278,   197,
+      197,   197,   197,   278,   197,   197,   284,   284,   284,     4,
+      195,     8,     8,   190,     4,     4,   284,   197,   278,     6,
+      278,     6,   224,     6,     6,     4,     6,   224,   224,   224,
+      224,   224,   195,   190,   190,   190,   195,   195,   224,   233,
+      195,   224,   235,   190,   190,     6,     7,   221,   222,   193,
+        7,     6,   288,   278,   195,   197,   197,   197,   197,   197,
+      221,   189,   278,   278,   283,   284,   196,   193,     6,     6,
+      203,     6,   278,   196,   278,   292,     6,     6,     6,   196,
+      196,    88,   241,   241,   284,     6,   196,   196,     6,     6,
+      284,   196,     6,     6,     5,   284,   197,   284,   284,     4,
+        6,   284,   284,   284,   284,   284,   284,   284,   284,   196,
+      196,     7,     6,     7,   278,   278,   278,   196,   196,   195,
+      197,   195,   197,   195,   197,   191,   278,   284,   278,     6,
+        6,     6,     6,   278,   281,   197,     5,   196,   284,   196,
+      196,   196,   284,   287,   196,     6,   192,     4,   224,   195,
+      195,   195,   195,   224,     6,     6,   135,   278,   278,   278,
+        6,     6,     7,   195,     6,     6,     6,   221,   222,   291,
+      292,     4,     4,   148,   292,   278,     6,     4,   289,     6,
+      192,   288,     6,     6,     6,     6,   284,   207,   278,   195,
+      195,   195,   197,   208,   278,     4,   291,   195,   284,   292,
+      278,   278,   281,     6,     6,     6,   278,   278,     6,   278,
+        5,     6,   196,     6,   139,   240,   278,     6,     6,     6,
+        6,     6,     6,     4,     6,     6,   287,   287,   278,   278,
+      292,   197,   190,   195,   197,   244,   244,   281,     6,   258,
+      281,     6,   259,   281,     6,   260,   278,   197,   195,   190,
+      197,   195,     6,   180,   281,     6,   283,   281,   281,     6,
+      197,   278,     6,   278,   278,   278,   278,   284,   195,   197,
+        8,   197,   190,   196,   278,   292,   284,   284,   190,   224,
+      196,   284,   292,   196,   278,   292,   292,     6,     6,     7,
+        6,   193,     6,   190,   195,   278,   278,   284,   196,   195,
+      197,     6,   278,   228,   229,   197,   197,   197,   197,   197,
+        5,   283,    76,     6,   196,   197,   197,   196,     6,     6,
+      196,   278,   197,   197,   195,   196,   195,   196,   195,   196,
+      192,     6,   284,     7,   196,   278,   195,   197,   195,   195,
+        6,   197,   195,   195,   195,   195,   134,   278,   278,   287,
+        6,     6,   197,     6,   231,   278,   294,   288,   137,   211,
+      278,   195,   195,   283,   278,     6,   195,   232,   234,     6,
+        6,     6,     6,     6,     6,   197,   196,   283,    99,   100,
+      105,   273,    99,   100,   273,   287,   244,   195,   197,   278,
+      281,   267,   278,   281,   267,   278,   281,   267,     6,   195,
+      197,   284,   245,   197,   281,     6,   287,   281,   278,   278,
+      278,   278,   278,   197,   197,   197,     6,   195,   197,     7,
+      197,     6,   196,   278,   278,   197,   278,   197,   197,   196,
+      278,   197,   196,   281,   284,     6,   196,   281,     6,   197,
+      197,   278,   197,   195,   197,   197,   195,   197,   197,   195,
+      197,   284,     6,    95,   197,   255,   196,   195,   197,   195,
+      195,   195,   195,   195,     6,     6,   278,   292,   208,   190,
+      195,     6,   196,   195,   278,   197,     6,   281,     6,   281,
+        6,     6,   197,     6,   261,   278,     6,     6,   262,   278,
+        6,     6,   263,   278,     6,   197,   278,   267,   245,   287,
+        6,   281,   287,   278,   278,   278,   278,     7,   197,   214,
+      278,   283,   278,   195,   195,   195,   196,   197,   196,   197,
+      196,   197,     6,     6,   197,   197,   256,   197,   195,   197,
+      195,   195,   195,   195,   292,     6,   196,   190,   197,   197,
+      278,   281,   281,   267,     6,   264,   267,     6,   265,   267,
+        6,   266,   267,     6,   287,     6,   278,   278,   278,   278,
+      212,   291,   217,   196,     6,   197,   195,   195,   197,   196,
+      197,   196,   197,   196,   197,   197,   195,   195,   195,   195,
+      195,   197,   196,   283,     6,   278,   278,     6,   267,     6,
+      267,     6,   267,     6,   278,   278,   278,   278,   291,     6,
+      215,   291,   197,   197,   197,   197,   197,   197,   197,   197,
+      197,   197,   195,   197,     6,     6,     6,     6,     6,     6,
+      291,     6
++>>>>>>> upstream/2.10.1+dfsg1
+ };
+ 
+   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+ static const yytype_uint16 yyr1[] =
+ {
+        0,   199,   200,   200,   201,   201,   202,   202,   202,   202,
+      202,   202,   202,   202,   202,   202,   202,   202,   202,   202,
+      202,   202,   203,   203,   204,   204,   204,   204,   204,   204,
+      205,   205,   205,   205,   206,   206,   206,   206,   206,   206,
+      207,   207,   208,   208,   210,   211,   209,   212,   212,   214,
+      213,   215,   215,   217,   216,   218,   218,   220,   219,   221,
+      221,   221,   221,   221,   222,   222,   223,   223,   224,   224,
+      225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+      225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+      225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+      225,   225,   225,   225,   225,   225,   225,   226,   226,   227,
+      227,   227,   228,   227,   227,   229,   227,   230,   230,   231,
+      231,   232,   232,   233,   233,   233,   234,   234,   235,   235,
+      235,   235,   236,   236,   236,   237,   237,   237,   238,   238,
+      238,   239,   239,   239,   240,   240,   241,   241,   242,   242,
+      242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
+      242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
+      242,   242,   242,   242,   242,   242,   242,   243,   243,   243,
+      243,   243,   243,   243,   243,   244,   244,   245,   245,   245,
+      245,   245,   245,   246,   246,   246,   246,   246,   246,   246,
+      246,   246,   247,   247,   247,   247,   247,   248,   248,   249,
+      250,   250,   250,   250,   250,   250,   251,   251,   251,   251,
+      251,   251,   251,   251,   251,   251,   251,   251,   251,   251,
+      251,   251,   251,   251,   251,   251,   252,   252,   252,   252,
+      252,   252,   252,   252,   252,   252,   253,   253,   253,   254,
+      253,   255,   253,   256,   253,   257,   253,   253,   253,   253,
+      253,   253,   253,   253,   253,   253,   258,   253,   259,   253,
+      260,   253,   261,   253,   262,   253,   263,   253,   264,   253,
+      265,   253,   266,   253,   267,   267,   268,   268,   268,   268,
+      268,   268,   268,   268,   268,   268,   268,   268,   268,   268,
+      268,   269,   269,   270,   270,   271,   271,   272,   272,   273,
+      273,   274,   274,   274,   274,   274,   274,   274,   274,   274,
+      274,   274,   274,   274,   274,   274,   274,   274,   274,   274,
+      274,   274,   274,   274,   274,   274,   274,   275,   275,   275,
+      276,   276,   276,   277,   277,   277,   277,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   278,
+      278,   278,   278,   278,   278,   278,   278,   278,   278,   279,
+      279,   279,   279,   279,   279,   279,   279,   279,   279,   280,
+      279,   279,   279,   279,   279,   279,   279,   279,   279,   279,
+      279,   279,   279,   279,   279,   279,   279,   279,   279,   279,
+      279,   279,   279,   279,   281,   281,   281,   281,   281,   282,
+      282,   282,   282,   283,   283,   284,   284,   284,   284,   284,
+      284,   285,   285,   286,   286,   286,   286,   286,   286,   286,
+      286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+      286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+      286,   287,   287,   287,   287,   288,   288,   288,   288,   289,
+      289,   290,   290,   291,   291,   291,   291,   292,   292,   292,
+      292,   292,   292,   292,   292,   292,   292,   292,   292,   292,
+      292,   292,   292,   292,   293,   292,   294,   294,   295,   295,
+      296,   296
+ };
+ 
+   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+ static const yytype_uint8 yyr2[] =
+ {
+        0,     2,     1,     2,     0,     2,     1,     1,     1,     1,
+        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+        1,     1,     1,     2,     5,     5,     7,     7,     7,     9,
+        6,     6,     6,     8,     0,     2,     2,     2,     2,     2,
+        1,     3,     1,     3,     0,     0,    10,     1,     3,     0,
+       13,     1,     3,     0,    15,     8,    14,     0,     6,     1,
+        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+        5,     5,     7,     7,     4,     6,     6,     7,     7,     7,
+        7,     9,     9,     3,     6,     6,     6,     6,     4,     6,
+        9,     6,     9,     5,     8,     8,    11,     6,     9,     5,
+        7,     9,     9,    11,     7,     9,     9,     0,     1,     0,
+        3,     5,     0,     9,     5,     0,     9,     0,     3,     3,
+        5,     0,     2,     3,     5,     3,     0,     2,     3,     3,
+        3,     5,     1,     1,     3,     1,     1,     3,     1,     1,
+        3,     1,     1,     3,     0,     5,     0,     2,     7,     8,
+        6,     7,     4,     7,     8,     8,     7,     7,    11,     8,
+        8,     8,     8,     9,     3,     4,    10,     7,     7,     8,
+        8,    12,     8,     8,     7,     8,     8,     5,    11,     5,
+        9,     9,     4,     9,     9,     1,     1,     0,     2,     6,
+        6,     6,     6,     8,    10,    14,    16,    12,     8,     8,
+        6,    14,     4,     6,     6,     3,     4,     5,     6,     5,
+        3,     3,     4,     5,     4,     5,     3,     5,     7,     7,
+        3,     7,     3,     2,     2,     2,     2,     2,    15,     2,
+        2,     2,     2,     2,    16,     3,     6,     8,     8,    10,
+        1,     2,     1,     3,     4,     1,     5,    11,    13,     0,
+        7,     0,    13,     0,    15,     0,     6,     8,     8,     8,
+       12,    12,    12,    14,    14,    14,     0,    12,     0,    12,
+        0,    12,     0,    16,     0,    16,     0,    16,     0,    18,
+        0,    18,     0,    18,     1,     2,     5,     7,     9,     2,
+        2,     2,     3,     2,     3,     2,     3,     2,     3,     9,
+        6,     0,     3,     0,     1,     0,     2,     0,     2,     0,
+        2,     7,     6,     8,     5,     3,     7,     5,     4,     6,
+       11,    11,    18,    18,    12,    12,    12,    10,    10,    10,
+       10,    10,     4,     4,     4,     4,     4,     2,     3,     6,
+        1,     1,     1,     2,     5,     7,    10,     1,     3,     2,
+        2,     2,     3,     3,     3,     3,     3,     3,     3,     3,
+        3,     3,     3,     3,     3,     3,     5,     4,     4,     4,
+        4,     4,     4,     4,     4,     4,     4,     6,     4,     4,
+        4,     4,     4,     4,     4,     6,     6,     6,     4,     1,
+        1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+        6,     4,     1,     4,     4,     4,     4,     4,     4,     4,
+        2,     5,     5,     5,     5,     3,     6,     4,     7,     6,
+        6,     6,     6,     4,     1,     2,     2,     3,     3,    11,
+        9,     7,     7,     1,     3,     1,     1,     2,     3,     4,
+        5,     1,     1,     2,     3,     3,     5,     4,     2,     2,
+        2,     2,     3,     3,     3,     3,     5,     5,     5,     5,
+       16,    16,    16,    16,     1,     1,     3,     3,     4,     6,
+        6,     1,     1,     3,     3,     9,     7,     1,     5,     3,
+        6,     1,     3,     1,     1,     3,     6,     1,     1,     1,
+        1,     4,     6,     4,     4,     4,     4,     8,     4,     8,
+        4,     6,     4,     1,     0,     6,     1,     3,     5,     5,
+        1,     1
  };
  
- #define yyerrok		(yyerrstatus = 0)
- #define yyclearin	(yychar = YYEMPTY)
- #define YYEMPTY		(-2)
- #define YYEOF		0
- 
- #define YYACCEPT	goto yyacceptlab
- #define YYABORT		goto yyabortlab
- #define YYERROR		goto yyerrorlab
- 
- 
- /* Like YYERROR except do call yyerror.  This remains here temporarily
-    to ease the transition to the new meaning of YYERROR, for GCC.
-    Once GCC version 2 has supplanted version 1, this can go.  However,
-    YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-    discussed.  */
- 
- #define YYFAIL		goto yyerrlab
- #if defined YYFAIL
-   /* This is here to suppress warnings from the GCC cpp's
-      -Wunused-macros.  Normally we don't worry about that warning, but
-      some users do, and we want to make it easy for users to remove
-      YYFAIL uses, which will produce warnings from Bison 2.5.  */
- #endif
+ 
+ #define yyerrok         (yyerrstatus = 0)
+ #define yyclearin       (yychar = YYEMPTY)
+ #define YYEMPTY         (-2)
+ #define YYEOF           0
+ 
+ #define YYACCEPT        goto yyacceptlab
+ #define YYABORT         goto yyabortlab
+ #define YYERROR         goto yyerrorlab
+ 
  
  #define YYRECOVERING()  (!!yyerrstatus)
  
@@@ -7607,9 -4230,9 +9286,10 @@@ yyreduce
    switch (yyn)
      {
          case 3:
 -#line 192 "Gmsh.y" /* yacc.c:1646  */
 -    { yyerrok; return 1; }
 -#line 4236 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 183 "Gmsh.y"
 +    { yyerrok; return 1; ;}
      break;
  
    case 6:
@@@ -7688,224 -4326,102 +9368,364 @@@
      break;
  
    case 21:
 -#line 218 "Gmsh.y" /* yacc.c:1646  */
 +#line 213 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 184 "Gmsh.y"
 +    { yyerrok; return 1; }
 +    break;
 +
 +  case 6:
 +/* Line 1787 of yacc.c  */
 +#line 195 "Gmsh.y"
      { return 1; }
 -#line 4332 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 -  case 22:
 -#line 223 "Gmsh.y" /* yacc.c:1646  */
 -    {
 -      (yyval.c) = (char*)"w";
 -    }
 -#line 4340 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 7:
 +/* Line 1787 of yacc.c  */
 +#line 196 "Gmsh.y"
 +    { return 1; }
      break;
  
 -  case 23:
 -#line 227 "Gmsh.y" /* yacc.c:1646  */
 -    {
 -      (yyval.c) = (char*)"a";
 -    }
 -#line 4348 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 8:
 +/* Line 1787 of yacc.c  */
 +#line 197 "Gmsh.y"
 +    { return 1; }
      break;
  
 -  case 24:
 -#line 234 "Gmsh.y" /* yacc.c:1646  */
 -    {
 -      Msg::Direct((yyvsp[-2].c));
 -      Free((yyvsp[-2].c));
 -    }
 -#line 4357 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 9:
 +/* Line 1787 of yacc.c  */
 +#line 198 "Gmsh.y"
 +    { return 1; }
      break;
  
 -  case 25:
 -#line 239 "Gmsh.y" /* yacc.c:1646  */
 -    {
 -      Msg::Error((yyvsp[-2].c));
 -      Free((yyvsp[-2].c));
 -    }
 -#line 4366 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 10:
 +/* Line 1787 of yacc.c  */
 +#line 199 "Gmsh.y"
 +    { List_Delete((yyvsp[(1) - (1)].l)); return 1; }
      break;
  
 -  case 26:
 -#line 244 "Gmsh.y" /* yacc.c:1646  */
 +  case 11:
 +/* Line 1787 of yacc.c  */
 +#line 200 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 12:
 +/* Line 1787 of yacc.c  */
 +#line 201 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 13:
 +/* Line 1787 of yacc.c  */
 +#line 202 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 14:
 +/* Line 1787 of yacc.c  */
 +#line 203 "Gmsh.y"
 +    { List_Delete((yyvsp[(1) - (1)].l)); return 1; }
 +    break;
 +
 +  case 15:
 +/* Line 1787 of yacc.c  */
 +#line 204 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 16:
 +/* Line 1787 of yacc.c  */
 +#line 205 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 17:
 +/* Line 1787 of yacc.c  */
 +#line 206 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 18:
 +/* Line 1787 of yacc.c  */
 +#line 207 "Gmsh.y"
 +    { return 1; }
 +    break;
 +
 +  case 19:
 +/* Line 1787 of yacc.c  */
 +#line 208 "Gmsh.y"
 +    { return 1; }
++=======
++#line 192 "Gmsh.y" /* yacc.c:1646  */
++    { yyerrok; return 1; }
++#line 4236 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 20:
- /* Line 1787 of yacc.c  */
- #line 209 "Gmsh.y"
++  case 6:
++#line 203 "Gmsh.y" /* yacc.c:1646  */
 +    { return 1; }
++#line 4242 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 21:
- /* Line 1787 of yacc.c  */
- #line 214 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
-     {
-       (yyval.c) = (char*)"w";
-     }
++  case 7:
++#line 204 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4248 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 8:
++#line 205 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4254 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 9:
++#line 206 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4260 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 10:
++#line 207 "Gmsh.y" /* yacc.c:1646  */
++    { List_Delete((yyvsp[0].l)); return 1; }
++#line 4266 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 11:
++#line 208 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4272 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 12:
++#line 209 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4278 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 13:
++#line 210 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4284 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 14:
++#line 211 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4290 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 15:
++#line 212 "Gmsh.y" /* yacc.c:1646  */
++    { List_Delete((yyvsp[0].l)); return 1; }
++#line 4296 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 16:
++#line 213 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4302 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 17:
++#line 214 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4308 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 18:
++#line 215 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4314 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 19:
++#line 216 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4320 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
++    break;
++
++  case 20:
++#line 217 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4326 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 21:
++<<<<<<< HEAD
++/* Line 1787 of yacc.c  */
++#line 214 "Gmsh.y"
++>>>>>>> upstream/2.9.3+dfsg1
++    {
++      (yyval.c) = (char*)"w";
++    }
 +    break;
 +
 +  case 22:
 +<<<<<<< HEAD
 +#line 217 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 218 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
++#line 218 "Gmsh.y" /* yacc.c:1646  */
++    { return 1; }
++#line 4332 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 22:
++#line 223 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
 +    {
-       (yyval.c) = (char*)"a";
++      (yyval.c) = (char*)"w";
 +    }
++#line 4340 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
 +  case 23:
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 224 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 225 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
++#line 227 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
 +    {
-       Msg::Direct((yyvsp[(3) - (5)].c));
-       Free((yyvsp[(3) - (5)].c));
++      (yyval.c) = (char*)"a";
 +    }
++#line 4348 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
 +  case 24:
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 229 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 230 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
++#line 234 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
 +    {
-       Msg::Error((yyvsp[(3) - (5)].c));
-       Free((yyvsp[(3) - (5)].c));
++      Msg::Direct((yyvsp[-2].c));
++      Free((yyvsp[-2].c));
 +    }
++#line 4357 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
 +  case 25:
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 234 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 235 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
++#line 239 "Gmsh.y" /* yacc.c:1646  */
++    {
++      Msg::Error((yyvsp[-2].c));
++      Free((yyvsp[-2].c));
++    }
++#line 4366 "Gmsh.tab.cpp" /* yacc.c:1646  */
++    break;
++
++  case 26:
++#line 244 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(6) - (7)].c));
-       FILE *fp = Fopen(tmp.c_str(), (yyvsp[(5) - (7)].c));
+       std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
+       FILE *fp = Fopen(tmp.c_str(), (yyvsp[-2].c));
        if(!fp){
  	yymsg(0, "Unable to open file '%s'", tmp.c_str());
        }
        else{
- 	fprintf(fp, "%s\n", (yyvsp[(3) - (7)].c));
+ 	fprintf(fp, "%s\n", (yyvsp[-4].c));
  	fclose(fp);
        }
-       Free((yyvsp[(3) - (7)].c));
-       Free((yyvsp[(6) - (7)].c));
+       Free((yyvsp[-4].c));
+       Free((yyvsp[-1].c));
      }
+ #line 4384 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 26:
 +<<<<<<< HEAD
 +#line 248 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 249 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 27:
+ #line 258 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstring[5000];
-       int i = PrintListOfDouble((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].l), tmpstring);
+       int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
        if(i < 0)
  	yymsg(0, "Too few arguments in Printf");
        else if(i > 0)
  	yymsg(0, "%d extra argument%s in Printf", i, (i > 1) ? "s" : "");
        else
  	Msg::Direct(tmpstring);
-       Free((yyvsp[(3) - (7)].c));
-       List_Delete((yyvsp[(5) - (7)].l));
+       Free((yyvsp[-4].c));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 4401 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 27:
 +<<<<<<< HEAD
 +#line 261 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 262 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 28:
+ #line 271 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstring[5000];
-       int i = PrintListOfDouble((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].l), tmpstring);
+       int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
        if(i < 0)
  	yymsg(0, "Too few arguments in Error");
        else if(i > 0)
  	yymsg(0, "%d extra argument%s in Error", i, (i > 1) ? "s" : "");
        else
  	Msg::Error(tmpstring);
-       Free((yyvsp[(3) - (7)].c));
-       List_Delete((yyvsp[(5) - (7)].l));
+       Free((yyvsp[-4].c));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 4418 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 28:
 +<<<<<<< HEAD
 +#line 274 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 275 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 29:
+ #line 284 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstring[5000];
-       int i = PrintListOfDouble((yyvsp[(3) - (9)].c), (yyvsp[(5) - (9)].l), tmpstring);
+       int i = PrintListOfDouble((yyvsp[-6].c), (yyvsp[-4].l), tmpstring);
        if(i < 0)
  	yymsg(0, "Too few arguments in Printf");
        else if(i > 0)
@@@ -7921,23 -4437,19 +9741,29 @@@
  	  fclose(fp);
  	}
        }
-       Free((yyvsp[(3) - (9)].c));
-       Free((yyvsp[(8) - (9)].c));
-       List_Delete((yyvsp[(5) - (9)].l));
+       Free((yyvsp[-6].c));
+       Free((yyvsp[-1].c));
+       List_Delete((yyvsp[-4].l));
      }
+ #line 4445 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 29:
 +<<<<<<< HEAD
 +#line 302 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 303 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 30:
+ #line 312 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(1) - (6)].c), "View") && ViewData->finalize()){
- 	ViewData->setName((yyvsp[(2) - (6)].c));
+       if(!strcmp((yyvsp[-5].c), "View") && ViewData->finalize()){
+ 	ViewData->setName((yyvsp[-4].c));
  	ViewData->setFileName(gmsh_yyname);
  	ViewData->setFileIndex(gmsh_yyviewindex++);
  	new PView(ViewData);
@@@ -7945,63 -4457,51 +9771,81 @@@
        else
  	delete ViewData;
  #endif
-       Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(2) - (6)].c));
+       Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
      }
+ #line 4463 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 30:
 +<<<<<<< HEAD
 +#line 316 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 317 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 31:
+ #line 326 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (6)].c), "View")){
- 	int index = (int)(yyvsp[(4) - (6)].d);
+       if(!strcmp((yyvsp[-4].c), "View")){
+ 	int index = (int)(yyvsp[-2].d);
  	if(index >= 0 && index < (int)PView::list.size())
  	  new PView(PView::list[index], false);
          else
  	  yymsg(0, "Unknown view %d", index);
        }
  #endif
-       Free((yyvsp[(2) - (6)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 4480 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 31:
 +<<<<<<< HEAD
 +#line 329 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 330 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 32:
+ #line 339 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (6)].c), "View")){
- 	int index = (int)(yyvsp[(4) - (6)].d);
+       if(!strcmp((yyvsp[-4].c), "View")){
+ 	int index = (int)(yyvsp[-2].d);
  	if(index >= 0 && index < (int)PView::list.size())
  	  new PView(PView::list[index], true);
          else
  	  yymsg(0, "Unknown view %d", index);
        }
  #endif
-       Free((yyvsp[(2) - (6)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 4497 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 32:
 +<<<<<<< HEAD
 +#line 342 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 343 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 33:
+ #line 352 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (8)].c), "View")){
- 	int index = (int)(yyvsp[(4) - (8)].d), index2 = (int)(yyvsp[(6) - (8)].d);
+       if(!strcmp((yyvsp[-6].c), "View")){
+ 	int index = (int)(yyvsp[-4].d), index2 = (int)(yyvsp[-2].d);
  	if(index >= 0 && index < (int)PView::list.size() &&
             index2 >= 0 && index2 < (int)PView::list.size()){
            PView::list[index2]->setOptions(PView::list[index]->getOptions());
@@@ -8010,51 -4510,19 +9854,61 @@@
  	  yymsg(0, "Unknown view %d or %d", index, index2);
        }
  #endif
-       Free((yyvsp[(2) - (8)].c));
+       Free((yyvsp[-6].c));
      }
+ #line 4516 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 33:
 +<<<<<<< HEAD
 +#line 360 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 361 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 34:
+ #line 370 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        ViewData = new PViewDataList();
  #endif
      }
++<<<<<<< HEAD
 +    break;
 +
 +  case 39:
 +<<<<<<< HEAD
 +#line 374 "Gmsh.y"
 +    { ViewCoord.push_back((yyvsp[(1) - (1)].d)); ;}
 +    break;
 +
 +  case 40:
 +#line 376 "Gmsh.y"
 +    { ViewCoord.push_back((yyvsp[(3) - (3)].d)); ;}
 +    break;
 +
 +  case 41:
 +#line 381 "Gmsh.y"
 +    { if(ViewValueList) ViewValueList->push_back((yyvsp[(1) - (1)].d)); ;}
 +    break;
 +
 +  case 42:
 +#line 383 "Gmsh.y"
 +    { if(ViewValueList) ViewValueList->push_back((yyvsp[(3) - (3)].d)); ;}
 +    break;
 +
 +  case 43:
 +#line 388 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 375 "Gmsh.y"
 +    { ViewCoord.push_back((yyvsp[(1) - (1)].d)); }
++=======
+ #line 4526 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      break;
  
    case 40:
@@@ -8076,121 -4544,121 +9930,137 @@@
      break;
  
    case 43:
++<<<<<<< HEAD
 +/* Line 1787 of yacc.c  */
 +#line 389 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 393 "Gmsh.y" /* yacc.c:1646  */
+     { if(ViewValueList) ViewValueList->push_back((yyvsp[0].d)); }
+ #line 4550 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 44:
+ #line 398 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strncmp((yyvsp[(1) - (1)].c), "SP", 2)){
+       if(!strncmp((yyvsp[0].c), "SP", 2)){
  	ViewValueList = &ViewData->SP; ViewNumList = &ViewData->NbSP;
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VP", 2)){
+       else if(!strncmp((yyvsp[0].c), "VP", 2)){
  	ViewValueList = &ViewData->VP; ViewNumList = &ViewData->NbVP;
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TP", 2)){
+       else if(!strncmp((yyvsp[0].c), "TP", 2)){
  	ViewValueList = &ViewData->TP; ViewNumList = &ViewData->NbTP;
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SL", 2)){
+       else if(!strncmp((yyvsp[0].c), "SL", 2)){
  	ViewValueList = &ViewData->SL; ViewNumList = &ViewData->NbSL;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VL", 2)){
+       else if(!strncmp((yyvsp[0].c), "VL", 2)){
  	ViewValueList = &ViewData->VL; ViewNumList = &ViewData->NbVL;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TL", 2)){
+       else if(!strncmp((yyvsp[0].c), "TL", 2)){
  	ViewValueList = &ViewData->TL; ViewNumList = &ViewData->NbTL;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "ST", 2)){
+       else if(!strncmp((yyvsp[0].c), "ST", 2)){
  	ViewValueList = &ViewData->ST; ViewNumList = &ViewData->NbST;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VT", 2)){
+       else if(!strncmp((yyvsp[0].c), "VT", 2)){
  	ViewValueList = &ViewData->VT; ViewNumList = &ViewData->NbVT;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TT", 2)){
+       else if(!strncmp((yyvsp[0].c), "TT", 2)){
  	ViewValueList = &ViewData->TT; ViewNumList = &ViewData->NbTT;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SQ", 2)){
+       else if(!strncmp((yyvsp[0].c), "SQ", 2)){
  	ViewValueList = &ViewData->SQ; ViewNumList = &ViewData->NbSQ;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VQ", 2)){
+       else if(!strncmp((yyvsp[0].c), "VQ", 2)){
  	ViewValueList = &ViewData->VQ; ViewNumList = &ViewData->NbVQ;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TQ", 2)){
+       else if(!strncmp((yyvsp[0].c), "TQ", 2)){
  	ViewValueList = &ViewData->TQ; ViewNumList = &ViewData->NbTQ;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SS", 2)){
+       else if(!strncmp((yyvsp[0].c), "SS", 2)){
  	ViewValueList = &ViewData->SS; ViewNumList = &ViewData->NbSS;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VS", 2)){
+       else if(!strncmp((yyvsp[0].c), "VS", 2)){
  	ViewValueList = &ViewData->VS; ViewNumList = &ViewData->NbVS;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TS", 2)){
+       else if(!strncmp((yyvsp[0].c), "TS", 2)){
  	ViewValueList = &ViewData->TS; ViewNumList = &ViewData->NbTS;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SH", 2)){
+       else if(!strncmp((yyvsp[0].c), "SH", 2)){
  	ViewValueList = &ViewData->SH; ViewNumList = &ViewData->NbSH;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VH", 2)){
+       else if(!strncmp((yyvsp[0].c), "VH", 2)){
  	ViewValueList = &ViewData->VH; ViewNumList = &ViewData->NbVH;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TH", 2)){
+       else if(!strncmp((yyvsp[0].c), "TH", 2)){
  	ViewValueList = &ViewData->TH; ViewNumList = &ViewData->NbTH;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SI", 2)){
+       else if(!strncmp((yyvsp[0].c), "SI", 2)){
  	ViewValueList = &ViewData->SI; ViewNumList = &ViewData->NbSI;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VI", 2)){
+       else if(!strncmp((yyvsp[0].c), "VI", 2)){
  	ViewValueList = &ViewData->VI; ViewNumList = &ViewData->NbVI;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TI", 2)){
+       else if(!strncmp((yyvsp[0].c), "TI", 2)){
  	ViewValueList = &ViewData->TI; ViewNumList = &ViewData->NbTI;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "SY", 2)){
+       else if(!strncmp((yyvsp[0].c), "SY", 2)){
  	ViewValueList = &ViewData->SY; ViewNumList = &ViewData->NbSY;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "VY", 2)){
+       else if(!strncmp((yyvsp[0].c), "VY", 2)){
  	ViewValueList = &ViewData->VY; ViewNumList = &ViewData->NbVY;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
        }
-       else if(!strncmp((yyvsp[(1) - (1)].c), "TY", 2)){
+       else if(!strncmp((yyvsp[0].c), "TY", 2)){
  	ViewValueList = &ViewData->TY; ViewNumList = &ViewData->NbTY;
-         if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+         if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
        }
        else{
- 	yymsg(0, "Unknown element type '%s'", (yyvsp[(1) - (1)].c));
+ 	yymsg(0, "Unknown element type '%s'", (yyvsp[0].c));
  	ViewValueList = 0; ViewNumList = 0;
        }
  #endif
        ViewCoord.clear();
-       Free((yyvsp[(1) - (1)].c));
+       Free((yyvsp[0].c));
      }
+ #line 4658 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 44:
 +<<<<<<< HEAD
 +#line 492 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 493 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 45:
+ #line 502 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        if(ViewValueList){
@@@ -8200,150 -4668,110 +10070,210 @@@
        }
  #endif
      }
+ #line 4672 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 45:
 +<<<<<<< HEAD
 +#line 502 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 503 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 46:
+ #line 512 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        if(ViewValueList) (*ViewNumList)++;
  #endif
      }
+ #line 4682 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 46:
 +<<<<<<< HEAD
 +#line 511 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 512 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 47:
+ #line 521 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(1) - (1)].c)[i]);
+       for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
  #endif
-       Free((yyvsp[(1) - (1)].c));
+       Free((yyvsp[0].c));
      }
+ #line 4693 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 47:
 +<<<<<<< HEAD
 +#line 518 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 519 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 48:
+ #line 528 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(3) - (3)].c)[i]);
+       for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
  #endif
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[0].c));
      }
+ #line 4704 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 48:
 +<<<<<<< HEAD
 +#line 528 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 529 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 49:
+ #line 538 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       ViewData->T2D.push_back((yyvsp[(3) - (8)].d));
-       ViewData->T2D.push_back((yyvsp[(5) - (8)].d));
-       ViewData->T2D.push_back((yyvsp[(7) - (8)].d));
+       ViewData->T2D.push_back((yyvsp[-5].d));
+       ViewData->T2D.push_back((yyvsp[-3].d));
+       ViewData->T2D.push_back((yyvsp[-1].d));
        ViewData->T2D.push_back(ViewData->T2C.size());
  #endif
      }
+ #line 4717 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 49:
 +<<<<<<< HEAD
 +#line 537 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 538 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 50:
+ #line 547 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        ViewData->NbT2++;
  #endif
      }
+ #line 4727 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 50:
 +<<<<<<< HEAD
 +#line 546 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 547 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 51:
+ #line 556 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(1) - (1)].c)[i]);
+       for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
  #endif
-       Free((yyvsp[(1) - (1)].c));
+       Free((yyvsp[0].c));
      }
+ #line 4738 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 51:
 +<<<<<<< HEAD
 +#line 553 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 554 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 52:
+ #line 563 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(3) - (3)].c)[i]);
+       for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
  #endif
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[0].c));
      }
+ #line 4749 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 52:
 +<<<<<<< HEAD
 +#line 563 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 564 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 53:
+ #line 573 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       ViewData->T3D.push_back((yyvsp[(3) - (10)].d)); ViewData->T3D.push_back((yyvsp[(5) - (10)].d));
-       ViewData->T3D.push_back((yyvsp[(7) - (10)].d)); ViewData->T3D.push_back((yyvsp[(9) - (10)].d));
+       ViewData->T3D.push_back((yyvsp[-7].d)); ViewData->T3D.push_back((yyvsp[-5].d));
+       ViewData->T3D.push_back((yyvsp[-3].d)); ViewData->T3D.push_back((yyvsp[-1].d));
        ViewData->T3D.push_back(ViewData->T3C.size());
  #endif
      }
+ #line 4761 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 53:
 +<<<<<<< HEAD
 +#line 571 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 572 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 54:
+ #line 581 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        ViewData->NbT3++;
  #endif
      }
+ #line 4771 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 54:
 +<<<<<<< HEAD
 +#line 581 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 582 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 55:
+ #line 591 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        int type =
@@@ -8355,19 -4783,15 +10285,25 @@@
  	(ViewData->NbSI || ViewData->NbVI) ? TYPE_PRI :
        	(ViewData->NbSH || ViewData->NbVH) ? TYPE_HEX :
  	0;
-       ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[(3) - (8)].l)),
-                                          ListOfListOfDouble2Matrix((yyvsp[(6) - (8)].l)));
+       ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[-5].l)),
+                                          ListOfListOfDouble2Matrix((yyvsp[-2].l)));
  #endif
      }
+ #line 4791 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 55:
 +<<<<<<< HEAD
 +#line 600 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 601 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 56:
+ #line 610 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        int type =
@@@ -8377,177 -4801,129 +10313,228 @@@
  	(ViewData->NbSS || ViewData->NbVS) ? TYPE_TET :
        	(ViewData->NbSH || ViewData->NbVH) ? TYPE_HEX :
  	0;
-       ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[(3) - (14)].l)),
-                                          ListOfListOfDouble2Matrix((yyvsp[(6) - (14)].l)),
-                                          ListOfListOfDouble2Matrix((yyvsp[(9) - (14)].l)),
-                                          ListOfListOfDouble2Matrix((yyvsp[(12) - (14)].l)));
+       ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[-11].l)),
+                                          ListOfListOfDouble2Matrix((yyvsp[-8].l)),
+                                          ListOfListOfDouble2Matrix((yyvsp[-5].l)),
+                                          ListOfListOfDouble2Matrix((yyvsp[-2].l)));
  #endif
      }
+ #line 4811 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 56:
 +<<<<<<< HEAD
 +#line 619 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 620 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 57:
+ #line 629 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
        ViewValueList = &ViewData->Time;
  #endif
      }
+ #line 4821 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 57:
 +<<<<<<< HEAD
 +#line 625 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 626 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 58:
+ #line 635 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
      }
+ #line 4828 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 58:
 +<<<<<<< HEAD
 +#line 632 "Gmsh.y"
 +    { (yyval.i) = 0; ;}
 +    break;
 +
 +  case 59:
 +#line 633 "Gmsh.y"
 +    { (yyval.i) = 1; ;}
 +    break;
 +
 +  case 60:
 +#line 634 "Gmsh.y"
 +    { (yyval.i) = 2; ;}
 +    break;
 +
 +  case 61:
 +#line 635 "Gmsh.y"
 +    { (yyval.i) = 3; ;}
 +    break;
 +
 +  case 62:
 +#line 636 "Gmsh.y"
 +    { (yyval.i) = 4; ;}
 +    break;
 +
 +  case 63:
 +#line 640 "Gmsh.y"
 +    { (yyval.i) = 1; ;}
 +    break;
 +
 +  case 64:
 +#line 641 "Gmsh.y"
 +    { (yyval.i) = -1; ;}
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 633 "Gmsh.y"
++=======
+   case 59:
+ #line 642 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      { (yyval.i) = 0; }
+ #line 4834 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 59:
- /* Line 1787 of yacc.c  */
- #line 634 "Gmsh.y"
+   case 60:
+ #line 643 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = 1; }
+ #line 4840 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 60:
- /* Line 1787 of yacc.c  */
- #line 635 "Gmsh.y"
+   case 61:
+ #line 644 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = 2; }
+ #line 4846 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 61:
- /* Line 1787 of yacc.c  */
- #line 636 "Gmsh.y"
+   case 62:
+ #line 645 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = 3; }
+ #line 4852 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 62:
- /* Line 1787 of yacc.c  */
- #line 637 "Gmsh.y"
+   case 63:
+ #line 646 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = 4; }
+ #line 4858 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 63:
- /* Line 1787 of yacc.c  */
- #line 641 "Gmsh.y"
+   case 64:
+ #line 650 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = 1; }
+ #line 4864 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 64:
- /* Line 1787 of yacc.c  */
- #line 642 "Gmsh.y"
+   case 65:
+ #line 651 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.i) = -1; }
+ #line 4870 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 65:
- /* Line 1787 of yacc.c  */
- #line 648 "Gmsh.y"
+   case 66:
+ #line 657 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.c) = (char*)"("; }
+ #line 4876 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 66:
- /* Line 1787 of yacc.c  */
- #line 648 "Gmsh.y"
+   case 67:
+ #line 657 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.c) = (char*)"["; }
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
 +    break;
 +
 +  case 65:
 +#line 647 "Gmsh.y"
 +    { (yyval.c) = (char*)"("; ;}
 +    break;
 +
 +  case 66:
 +#line 647 "Gmsh.y"
 +    { (yyval.c) = (char*)"["; ;}
 +    break;
 +
 +  case 67:
 +<<<<<<< HEAD
 +#line 648 "Gmsh.y"
 +    { (yyval.c) = (char*)")"; ;}
 +    break;
 +
 +  case 68:
 +#line 648 "Gmsh.y"
 +    { (yyval.c) = (char*)"]"; ;}
 +    break;
 +
 +  case 71:
 +#line 657 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 649 "Gmsh.y"
-     { (yyval.c) = (char*)")"; }
++=======
+ #line 4882 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
    case 68:
- /* Line 1787 of yacc.c  */
- #line 649 "Gmsh.y"
+ #line 658 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
+     { (yyval.c) = (char*)")"; }
+ #line 4888 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 69:
+ #line 658 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.c) = (char*)"]"; }
+ #line 4894 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 72:
+ #line 667 "Gmsh.y" /* yacc.c:1646  */
+     {
+       Msg::SetOnelabNumber((yyvsp[-4].c), (yyvsp[-2].d));
+       Free((yyvsp[-4].c));
+     }
+ #line 4903 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
+   case 73:
+ #line 672 "Gmsh.y" /* yacc.c:1646  */
+     {
+       Msg::SetOnelabString((yyvsp[-4].c), (yyvsp[-2].c));
+       Free((yyvsp[-4].c));
+       Free((yyvsp[-2].c));
+     }
+ #line 4913 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
++<<<<<<< HEAD
 +  case 71:
 +/* Line 1787 of yacc.c  */
 +#line 658 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 74:
+ #line 678 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c)) && (yyvsp[(2) - (4)].i) && List_Nbr((yyvsp[(3) - (4)].l)) == 1){
-         yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-3].c)) && (yyvsp[-2].i) && List_Nbr((yyvsp[-1].l)) == 1){
+         yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
        }
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
-         if(!(yyvsp[(2) - (4)].i)) s.list = (List_Nbr((yyvsp[(3) - (4)].l)) != 1); // list if 0 or > 1 elements
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
+         if(!(yyvsp[-2].i)) s.list = (List_Nbr((yyvsp[-1].l)) != 1); // list if 0 or > 1 elements
          if(!s.list){ // single expression
-           if(List_Nbr((yyvsp[(3) - (4)].l)) != 1){
-             yymsg(0, "Cannot assign list to variable '%s'", (yyvsp[(1) - (4)].c));
+           if(List_Nbr((yyvsp[-1].l)) != 1){
+             yymsg(0, "Cannot assign list to variable '%s'", (yyvsp[-3].c));
            }
            else{
              double d;
@@@ -8594,23 -4970,19 +10581,29 @@@
            }
          }
        }
-       Free((yyvsp[(1) - (4)].c));
-       List_Delete((yyvsp[(3) - (4)].l));
+       Free((yyvsp[-3].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 4977 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 72:
 +<<<<<<< HEAD
 +#line 718 "Gmsh.y"
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 719 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 75:
+ #line 738 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
+       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
        s.list = true;
        double d;
-       switch((yyvsp[(4) - (6)].i)){
+       switch((yyvsp[-2].i)){
        case 0: // affect
          s.value.clear(); // fall-through
        case 1: // append
@@@ -8631,23 -5003,19 +10624,29 @@@
          yymsg(0, "Operators *= and /= not available for lists");
          break;
        }
-       Free((yyvsp[(1) - (6)].c));
-       List_Delete((yyvsp[(5) - (6)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5010 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 73:
 +<<<<<<< HEAD
 +#line 747 "Gmsh.y"
 +    {
 +=======
 +/* Line 1787 of yacc.c  */
 +#line 748 "Gmsh.y"
++=======
+   case 76:
+ #line 767 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
+       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
        s.list = true;
        double d;
-       switch((yyvsp[(4) - (6)].i)){
+       switch((yyvsp[-2].i)){
        case 0: // affect
          s.value.clear(); // fall-through
        case 1: // append
@@@ -8668,310 -5036,245 +10667,444 @@@
          yymsg(0, "Operators *= and /= not available for lists");
          break;
        }
-       Free((yyvsp[(1) - (6)].c));
-       List_Delete((yyvsp[(5) - (6)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5043 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 74:
- /* Line 1787 of yacc.c  */
- #line 777 "Gmsh.y"
+   case 77:
+ #line 796 "Gmsh.y" /* yacc.c:1646  */
      {
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
 +      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
 +      Free((yyvsp[(1) - (7)].c));
++=======
+       assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+       Free((yyvsp[-6].c));
++>>>>>>> upstream/2.10.1+dfsg1
      }
+ #line 5052 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 74:
 +#line 752 "Gmsh.y"
 +=======
 +  case 75:
 +/* Line 1787 of yacc.c  */
 +#line 782 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 78:
+ #line 801 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-       Free((yyvsp[(1) - (7)].c));
+       assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+       Free((yyvsp[-6].c));
      }
+ #line 5061 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 75:
 +#line 757 "Gmsh.y"
 +    {
 +      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
 +      Free((yyvsp[(1) - (7)].c));
 +    ;}
 +    break;
 +
 +  case 76:
 +#line 762 "Gmsh.y"
 +=======
 +  case 76:
 +/* Line 1787 of yacc.c  */
 +#line 787 "Gmsh.y"
++=======
+   case 79:
+ #line 806 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-       Free((yyvsp[(1) - (7)].c));
+       assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+       Free((yyvsp[-6].c));
      }
+ #line 5070 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 77:
 +/* Line 1787 of yacc.c  */
 +#line 792 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 80:
+ #line 811 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       assignVariables((yyvsp[(1) - (9)].c), (yyvsp[(4) - (9)].l), (yyvsp[(7) - (9)].i), (yyvsp[(8) - (9)].l));
-       Free((yyvsp[(1) - (9)].c));
-       List_Delete((yyvsp[(4) - (9)].l));
-       List_Delete((yyvsp[(8) - (9)].l));
+       assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+       Free((yyvsp[-6].c));
      }
+ #line 5079 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 77:
 +#line 769 "Gmsh.y"
 +=======
 +  case 78:
 +/* Line 1787 of yacc.c  */
 +#line 799 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 81:
+ #line 816 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       assignVariables((yyvsp[(1) - (9)].c), (yyvsp[(4) - (9)].l), (yyvsp[(7) - (9)].i), (yyvsp[(8) - (9)].l));
-       Free((yyvsp[(1) - (9)].c));
-       List_Delete((yyvsp[(4) - (9)].l));
-       List_Delete((yyvsp[(8) - (9)].l));
+       assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
+       Free((yyvsp[-8].c));
+       List_Delete((yyvsp[-5].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5090 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 78:
 +#line 776 "Gmsh.y"
 +=======
 +  case 79:
 +/* Line 1787 of yacc.c  */
 +#line 806 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 82:
+ #line 823 "Gmsh.y" /* yacc.c:1646  */
+     {
+       assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
+       Free((yyvsp[-8].c));
+       List_Delete((yyvsp[-5].l));
+       List_Delete((yyvsp[-1].l));
+     }
+ #line 5101 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 83:
+ #line 830 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
          if(!s.list && s.value.empty())
-           yymsg(0, "Uninitialized variable '%s'", (yyvsp[(1) - (3)].c));
+           yymsg(0, "Uninitialized variable '%s'", (yyvsp[-2].c));
          else if(!s.list)
-           s.value[0] += (yyvsp[(2) - (3)].i);
+           s.value[0] += (yyvsp[-1].i);
          else
-           yymsg(0, "Variable '%s' is a list", (yyvsp[(1) - (3)].c));
+           yymsg(0, "Variable '%s' is a list", (yyvsp[-2].c));
        }
-       Free((yyvsp[(1) - (3)].c));
+       Free((yyvsp[-2].c));
      }
+ #line 5120 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 79:
 +#line 791 "Gmsh.y"
 +=======
 +  case 80:
 +/* Line 1787 of yacc.c  */
 +#line 821 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 84:
+ #line 845 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-       Free((yyvsp[(1) - (6)].c));
+       incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+       Free((yyvsp[-5].c));
      }
+ #line 5129 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 80:
 +#line 796 "Gmsh.y"
 +    {
 +      incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
 +      Free((yyvsp[(1) - (6)].c));
 +    ;}
 +    break;
 +
 +  case 81:
 +#line 801 "Gmsh.y"
 +=======
 +  case 81:
 +/* Line 1787 of yacc.c  */
 +#line 826 "Gmsh.y"
++=======
+   case 85:
+ #line 850 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-       Free((yyvsp[(1) - (6)].c));
+       incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+       Free((yyvsp[-5].c));
      }
+ #line 5138 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 82:
 +/* Line 1787 of yacc.c  */
 +#line 831 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 86:
+ #line 855 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       gmsh_yystringsymbols[(yyvsp[(1) - (4)].c)] = std::string((yyvsp[(3) - (4)].c));
-       Free((yyvsp[(1) - (4)].c));
-       Free((yyvsp[(3) - (4)].c));
+       incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+       Free((yyvsp[-5].c));
      }
+ #line 5147 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 82:
 +#line 810 "Gmsh.y"
 +=======
 +  case 83:
 +/* Line 1787 of yacc.c  */
 +#line 840 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 87:
+ #line 860 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string tmp((yyvsp[(5) - (6)].c));
-       StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), tmp);
-       Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
+       incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+       Free((yyvsp[-5].c));
      }
+ #line 5156 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 83:
 +#line 816 "Gmsh.y"
 +=======
 +  case 84:
 +/* Line 1787 of yacc.c  */
 +#line 846 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 88:
+ #line 865 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string tmp((yyvsp[(8) - (9)].c));
-       StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), tmp);
-       Free((yyvsp[(1) - (9)].c)); Free((yyvsp[(6) - (9)].c)); Free((yyvsp[(8) - (9)].c));
+       gmsh_yystringsymbols[(yyvsp[-3].c)] = std::string((yyvsp[-1].c));
+       Free((yyvsp[-3].c));
+       Free((yyvsp[-1].c));
      }
+ #line 5166 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 84:
 +#line 825 "Gmsh.y"
 +=======
 +  case 85:
 +/* Line 1787 of yacc.c  */
 +#line 855 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 89:
+ #line 874 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string tmp((yyvsp[-1].c));
+       StringOption(GMSH_SET|GMSH_GUI, (yyvsp[-5].c), 0, (yyvsp[-3].c), tmp);
+       Free((yyvsp[-5].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+     }
+ #line 5176 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 90:
+ #line 880 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string tmp((yyvsp[-1].c));
+       StringOption(GMSH_SET|GMSH_GUI, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), tmp);
+       Free((yyvsp[-8].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+     }
+ #line 5186 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 91:
+ #line 889 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), d)){
- 	switch((yyvsp[(4) - (6)].i)){
- 	case 0 : d = (yyvsp[(5) - (6)].d); break;
- 	case 1 : d += (yyvsp[(5) - (6)].d); break;
- 	case 2 : d -= (yyvsp[(5) - (6)].d); break;
- 	case 3 : d *= (yyvsp[(5) - (6)].d); break;
+       if(NumberOption(GMSH_GET, (yyvsp[-5].c), 0, (yyvsp[-3].c), d)){
+ 	switch((yyvsp[-2].i)){
+ 	case 0 : d = (yyvsp[-1].d); break;
+ 	case 1 : d += (yyvsp[-1].d); break;
+ 	case 2 : d -= (yyvsp[-1].d); break;
+ 	case 3 : d *= (yyvsp[-1].d); break;
  	case 4 :
- 	  if((yyvsp[(5) - (6)].d)) d /= (yyvsp[(5) - (6)].d);
- 	  else yymsg(0, "Division by zero in '%s.%s /= %g'", (yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
+ 	  if((yyvsp[-1].d)) d /= (yyvsp[-1].d);
+ 	  else yymsg(0, "Division by zero in '%s.%s /= %g'", (yyvsp[-5].c), (yyvsp[-3].c), (yyvsp[-1].d));
  	  break;
  	}
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), d);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-5].c), 0, (yyvsp[-3].c), d);
        }
-       Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(3) - (6)].c));
+       Free((yyvsp[-5].c)); Free((yyvsp[-3].c));
      }
+ #line 5208 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 85:
 +#line 843 "Gmsh.y"
 +=======
 +  case 86:
 +/* Line 1787 of yacc.c  */
 +#line 873 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 92:
+ #line 907 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), d)){
- 	switch((yyvsp[(7) - (9)].i)){
- 	case 0 : d = (yyvsp[(8) - (9)].d); break;
- 	case 1 : d += (yyvsp[(8) - (9)].d); break;
- 	case 2 : d -= (yyvsp[(8) - (9)].d); break;
- 	case 3 : d *= (yyvsp[(8) - (9)].d); break;
+       if(NumberOption(GMSH_GET, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), d)){
+ 	switch((yyvsp[-2].i)){
+ 	case 0 : d = (yyvsp[-1].d); break;
+ 	case 1 : d += (yyvsp[-1].d); break;
+ 	case 2 : d -= (yyvsp[-1].d); break;
+ 	case 3 : d *= (yyvsp[-1].d); break;
  	case 4 :
- 	  if((yyvsp[(8) - (9)].d)) d /= (yyvsp[(8) - (9)].d);
- 	  else yymsg(0, "Division by zero in '%s[%d].%s /= %g'", (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
+ 	  if((yyvsp[-1].d)) d /= (yyvsp[-1].d);
+ 	  else yymsg(0, "Division by zero in '%s[%d].%s /= %g'", (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), (yyvsp[-1].d));
  	  break;
  	}
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), d);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), d);
        }
-       Free((yyvsp[(1) - (9)].c)); Free((yyvsp[(6) - (9)].c));
+       Free((yyvsp[-8].c)); Free((yyvsp[-3].c));
      }
+ #line 5230 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 86:
 +#line 861 "Gmsh.y"
 +=======
 +  case 87:
 +/* Line 1787 of yacc.c  */
 +#line 891 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 93:
+ #line 925 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(3) - (5)].c), d)){
- 	d += (yyvsp[(4) - (5)].i);
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (5)].c), 0, (yyvsp[(3) - (5)].c), d);
+       if(NumberOption(GMSH_GET, (yyvsp[-4].c), 0, (yyvsp[-2].c), d)){
+ 	d += (yyvsp[-1].i);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-4].c), 0, (yyvsp[-2].c), d);
        }
-       Free((yyvsp[(1) - (5)].c)); Free((yyvsp[(3) - (5)].c));
+       Free((yyvsp[-4].c)); Free((yyvsp[-2].c));
      }
+ #line 5243 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 87:
 +#line 870 "Gmsh.y"
 +=======
 +  case 88:
 +/* Line 1787 of yacc.c  */
 +#line 900 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 94:
+ #line 934 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (8)].c), (int)(yyvsp[(3) - (8)].d), (yyvsp[(6) - (8)].c), d)){
- 	d += (yyvsp[(7) - (8)].i);
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), (int)(yyvsp[(3) - (8)].d), (yyvsp[(6) - (8)].c), d);
+       if(NumberOption(GMSH_GET, (yyvsp[-7].c), (int)(yyvsp[-5].d), (yyvsp[-2].c), d)){
+ 	d += (yyvsp[-1].i);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-7].c), (int)(yyvsp[-5].d), (yyvsp[-2].c), d);
        }
-       Free((yyvsp[(1) - (8)].c)); Free((yyvsp[(6) - (8)].c));
+       Free((yyvsp[-7].c)); Free((yyvsp[-2].c));
      }
+ #line 5256 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 88:
 +#line 882 "Gmsh.y"
 +=======
 +  case 89:
 +/* Line 1787 of yacc.c  */
 +#line 912 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 95:
+ #line 946 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), 0, (yyvsp[(5) - (8)].c), (yyvsp[(7) - (8)].u));
-       Free((yyvsp[(1) - (8)].c)); Free((yyvsp[(5) - (8)].c));
+       ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-7].c), 0, (yyvsp[-3].c), (yyvsp[-1].u));
+       Free((yyvsp[-7].c)); Free((yyvsp[-3].c));
      }
+ #line 5265 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 89:
 +#line 887 "Gmsh.y"
 +=======
 +  case 90:
 +/* Line 1787 of yacc.c  */
 +#line 917 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 96:
+ #line 951 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (11)].c), (int)(yyvsp[(3) - (11)].d), (yyvsp[(8) - (11)].c), (yyvsp[(10) - (11)].u));
-       Free((yyvsp[(1) - (11)].c)); Free((yyvsp[(8) - (11)].c));
+       ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-10].c), (int)(yyvsp[-8].d), (yyvsp[-3].c), (yyvsp[-1].u));
+       Free((yyvsp[-10].c)); Free((yyvsp[-3].c));
      }
+ #line 5274 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 90:
 +#line 895 "Gmsh.y"
 +=======
 +  case 91:
 +/* Line 1787 of yacc.c  */
 +#line 925 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 97:
+ #line 959 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        GmshColorTable *ct = GetColorTable(0);
        if(!ct)
@@@ -8988,153 -5291,123 +11121,189 @@@
  	  ct->table[1] = ct->table[0];
  	}
        }
-       Free((yyvsp[(1) - (6)].c));
-       List_Delete((yyvsp[(5) - (6)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5298 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 91:
 +#line 915 "Gmsh.y"
 +=======
 +  case 92:
 +/* Line 1787 of yacc.c  */
 +#line 945 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 98:
+ #line 979 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (9)].d));
+       GmshColorTable *ct = GetColorTable((int)(yyvsp[-6].d));
        if(!ct)
- 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (9)].d));
+ 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[-6].d));
        else{
- 	ct->size = List_Nbr((yyvsp[(8) - (9)].l));
+ 	ct->size = List_Nbr((yyvsp[-1].l));
  	if(ct->size > COLORTABLE_NBMAX_COLOR)
  	  yymsg(0, "Too many (%d>%d) colors in View[%d].ColorTable",
- 		   ct->size, COLORTABLE_NBMAX_COLOR, (int)(yyvsp[(3) - (9)].d));
+ 		   ct->size, COLORTABLE_NBMAX_COLOR, (int)(yyvsp[-6].d));
  	else
- 	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[(8) - (9)].l), i, &ct->table[i]);
+ 	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[-1].l), i, &ct->table[i]);
  	if(ct->size == 1){
  	  ct->size = 2;
  	  ct->table[1] = ct->table[0];
  	}
        }
-       Free((yyvsp[(1) - (9)].c));
-       List_Delete((yyvsp[(8) - (9)].l));
+       Free((yyvsp[-8].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5322 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 92:
 +#line 938 "Gmsh.y"
 +=======
 +  case 93:
 +/* Line 1787 of yacc.c  */
 +#line 968 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 99:
+ #line 1002 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       if(!strcmp((yyvsp[(1) - (5)].c),"Background"))
- 	GModel::current()->getFields()->setBackgroundFieldId((int)(yyvsp[(4) - (5)].d));
-       else if(!strcmp((yyvsp[(1) - (5)].c),"BoundaryLayer"))
- 	GModel::current()->getFields()->setBoundaryLayerFieldId((int)(yyvsp[(4) - (5)].d));
+       if(!strcmp((yyvsp[-4].c),"Background"))
+ 	GModel::current()->getFields()->setBackgroundFieldId((int)(yyvsp[-1].d));
+       else if(!strcmp((yyvsp[-4].c),"BoundaryLayer"))
+ 	GModel::current()->getFields()->setBoundaryLayerFieldId((int)(yyvsp[-1].d));
        else
- 	yymsg(0, "Unknown command %s Field", (yyvsp[(1) - (5)].c));
+ 	yymsg(0, "Unknown command %s Field", (yyvsp[-4].c));
  #endif
      }
+ #line 5337 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 93:
 +#line 949 "Gmsh.y"
 +=======
 +  case 94:
 +/* Line 1787 of yacc.c  */
 +#line 979 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 100:
+ #line 1013 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       if(!GModel::current()->getFields()->newField((int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c)))
- 	yymsg(0, "Cannot create field %i of type '%s'", (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c));
+       if(!GModel::current()->getFields()->newField((int)(yyvsp[-4].d), (yyvsp[-1].c)))
+ 	yymsg(0, "Cannot create field %i of type '%s'", (int)(yyvsp[-4].d), (yyvsp[-1].c));
  #endif
-       Free((yyvsp[(6) - (7)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 5349 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 94:
 +#line 957 "Gmsh.y"
 +=======
 +  case 95:
 +/* Line 1787 of yacc.c  */
 +#line 987 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 101:
+ #line 1021 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
+       Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
        if(field){
- 	FieldOption *option = field->options[(yyvsp[(6) - (9)].c)];
+ 	FieldOption *option = field->options[(yyvsp[-3].c)];
  	if(option){
- 	  try { option->numericalValue((yyvsp[(8) - (9)].d)); }
+ 	  try { option->numericalValue((yyvsp[-1].d)); }
  	  catch(...){
  	    yymsg(0, "Cannot assign a numerical value to option '%s' "
- 		  "in field %i of type '%s'", (yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+ 		  "in field %i of type '%s'", (yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
  	  }
  	}
  	else
  	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
- 		(yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+ 		(yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
        }
        else
- 	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (9)].d));
+ 	yymsg(0, "No field with id %i", (int)(yyvsp[-6].d));
  #endif
-       Free((yyvsp[(6) - (9)].c));
+       Free((yyvsp[-3].c));
      }
+ #line 5375 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 95:
 +#line 979 "Gmsh.y"
 +=======
 +  case 96:
 +/* Line 1787 of yacc.c  */
 +#line 1009 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 102:
+ #line 1043 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
+       Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
        if(field){
- 	FieldOption *option = field->options[(yyvsp[(6) - (9)].c)];
+ 	FieldOption *option = field->options[(yyvsp[-3].c)];
  	if(option){
- 	  try { option->string((yyvsp[(8) - (9)].c)); }
+ 	  try { option->string((yyvsp[-1].c)); }
  	  catch (...){
  	    yymsg(0, "Cannot assign a string value to  option '%s' "
- 		  "in field %i of type '%s'", (yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+ 		  "in field %i of type '%s'", (yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
  	  }
  	}
  	else
  	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
- 		(yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+ 		(yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
        }
        else
- 	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (9)].d));
+ 	yymsg(0, "No field with id %i", (int)(yyvsp[-6].d));
  #endif
-       Free((yyvsp[(6) - (9)].c));
-       Free((yyvsp[(8) - (9)].c));
+       Free((yyvsp[-3].c));
+       Free((yyvsp[-1].c));
      }
+ #line 5402 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 96:
 +#line 1002 "Gmsh.y"
 +=======
 +  case 97:
 +/* Line 1787 of yacc.c  */
 +#line 1032 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 103:
+ #line 1066 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (11)].d));
+       Field *field = GModel::current()->getFields()->get((int)(yyvsp[-8].d));
        if(field){
- 	FieldOption *option = field->options[(yyvsp[(6) - (11)].c)];
+ 	FieldOption *option = field->options[(yyvsp[-5].c)];
  	if(option){
  	  std::list<int> vl = option->list();
  	  vl.clear();
@@@ -9147,467 -5420,391 +11316,676 @@@
  	}
  	else
  	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
- 		(yyvsp[(6) - (11)].c), (int)(yyvsp[(3) - (11)].d), field->getName());
+ 		(yyvsp[-5].c), (int)(yyvsp[-8].d), field->getName());
        }
        else
- 	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (11)].d));
+ 	yymsg(0, "No field with id %i", (int)(yyvsp[-8].d));
  #endif
-       Free((yyvsp[(6) - (11)].c));
-       List_Delete((yyvsp[(9) - (11)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 5432 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 97:
 +#line 1028 "Gmsh.y"
 +=======
 +  case 98:
 +/* Line 1787 of yacc.c  */
 +#line 1058 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 104:
+ #line 1092 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (7)].d));
+       Field *field = GModel::current()->getFields()->get((int)(yyvsp[-4].d));
        if(field){
-         FieldCallback *callback = field->callbacks[(yyvsp[(6) - (7)].c)];
+         FieldCallback *callback = field->callbacks[(yyvsp[-1].c)];
          if(callback) {
            callback->run();
          }
          else
            yymsg(0, "Unknown callback '%s' in field %i of type '%s'",
-               (yyvsp[(6) - (7)].c), (int)(yyvsp[(3) - (7)].d), field->getName());
+               (yyvsp[-1].c), (int)(yyvsp[-4].d), field->getName());
        }
        else
- 	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (7)].d));
+ 	yymsg(0, "No field with id %i", (int)(yyvsp[-4].d));
  #endif
-       Free((yyvsp[(6) - (7)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 5454 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 98:
 +#line 1049 "Gmsh.y"
 +=======
 +  case 99:
 +/* Line 1787 of yacc.c  */
 +#line 1079 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 105:
+ #line 1113 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_PLUGINS)
        try {
- 	PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
+ 	PluginManager::instance()->setPluginOption((yyvsp[-6].c), (yyvsp[-3].c), (yyvsp[-1].d));
        }
        catch (...) {
- 	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
+ 	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[-3].c), (yyvsp[-6].c));
        }
  #endif
-       Free((yyvsp[(3) - (9)].c)); Free((yyvsp[(6) - (9)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-3].c));
      }
+ #line 5470 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 99:
 +#line 1061 "Gmsh.y"
 +=======
 +  case 100:
 +/* Line 1787 of yacc.c  */
 +#line 1091 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 106:
+ #line 1125 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_PLUGINS)
        try {
- 	PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].c));
+ 	PluginManager::instance()->setPluginOption((yyvsp[-6].c), (yyvsp[-3].c), (yyvsp[-1].c));
        }
        catch (...) {
- 	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
+ 	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[-3].c), (yyvsp[-6].c));
        }
  #endif
-       Free((yyvsp[(3) - (9)].c)); Free((yyvsp[(6) - (9)].c)); Free((yyvsp[(8) - (9)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
      }
+ #line 5486 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 103:
 +#line 1079 "Gmsh.y"
 +=======
 +  case 104:
 +/* Line 1787 of yacc.c  */
 +#line 1109 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 110:
+ #line 1143 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(3) - (3)].c));
+       std::string key((yyvsp[0].c));
        std::vector<double> val(1, 0.);
        if(!gmsh_yysymbols.count(key)){
          gmsh_yysymbols[key].value = val;
        }
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[0].c));
      }
+ #line 5499 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 104:
 +#line 1088 "Gmsh.y"
 +=======
 +  case 105:
 +/* Line 1787 of yacc.c  */
 +#line 1118 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 111:
+ #line 1152 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(3) - (5)].c));
-       std::vector<double> val(1, (yyvsp[(5) - (5)].d));
+       std::string key((yyvsp[-2].c));
+       std::vector<double> val(1, (yyvsp[0].d));
        if(!gmsh_yysymbols.count(key)){
          gmsh_yysymbols[key].value = val;
        }
-       Free((yyvsp[(3) - (5)].c));
+       Free((yyvsp[-2].c));
      }
+ #line 5512 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 105:
 +#line 1097 "Gmsh.y"
 +    { floatOptions.clear(); charOptions.clear(); ;}
 +    break;
 +
 +  case 106:
 +#line 1099 "Gmsh.y"
 +=======
 +  case 106:
 +/* Line 1787 of yacc.c  */
 +#line 1127 "Gmsh.y"
++=======
+   case 112:
+ #line 1161 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      { floatOptions.clear(); charOptions.clear(); }
+ #line 5518 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 107:
 +/* Line 1787 of yacc.c  */
 +#line 1129 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 113:
+ #line 1163 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(3) - (9)].c));
-       std::vector<double> val(1, (yyvsp[(6) - (9)].d));
+       std::string key((yyvsp[-6].c));
+       std::vector<double> val;
+       for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
+         double d;
+         List_Read((yyvsp[-3].l), i, &d);
+         val.push_back(d);
+       }
        if(!gmsh_yysymbols.count(key)){
          Msg::ExchangeOnelabParameter(key, val, floatOptions, charOptions);
          gmsh_yysymbols[key].value = val;
        }
-       Free((yyvsp[(3) - (9)].c));
+       Free((yyvsp[-6].c));
+       Free((yyvsp[-3].l));
      }
+ #line 5538 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 107:
 +#line 1109 "Gmsh.y"
 +=======
 +  case 108:
 +/* Line 1787 of yacc.c  */
 +#line 1139 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 114:
+ #line 1179 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(3) - (5)].c)), val((yyvsp[(5) - (5)].c));
+       std::string key((yyvsp[-2].c)), val((yyvsp[0].c));
        if(!gmsh_yystringsymbols.count(key)){
          gmsh_yystringsymbols[key] = val;
        }
-       Free((yyvsp[(3) - (5)].c));
-       Free((yyvsp[(5) - (5)].c));
+       Free((yyvsp[-2].c));
+       Free((yyvsp[0].c));
      }
+ #line 5551 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 108:
 +#line 1118 "Gmsh.y"
 +    { floatOptions.clear(); charOptions.clear(); ;}
 +    break;
 +
 +  case 109:
 +#line 1120 "Gmsh.y"
 +=======
 +  case 109:
 +/* Line 1787 of yacc.c  */
 +#line 1148 "Gmsh.y"
++=======
+   case 115:
+ #line 1188 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      { floatOptions.clear(); charOptions.clear(); }
+ #line 5557 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 110:
 +/* Line 1787 of yacc.c  */
 +#line 1150 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 116:
+ #line 1190 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(3) - (9)].c)), val((yyvsp[(6) - (9)].c));
+       std::string key((yyvsp[-6].c)), val((yyvsp[-3].c));
        if(!gmsh_yysymbols.count(key)){
          Msg::ExchangeOnelabParameter(key, val, floatOptions, charOptions);
          gmsh_yystringsymbols[key] = val;
        }
-       Free((yyvsp[(3) - (9)].c));
-       Free((yyvsp[(6) - (9)].c));
+       Free((yyvsp[-6].c));
+       Free((yyvsp[-3].c));
      }
+ #line 5571 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 111:
 +#line 1134 "Gmsh.y"
 +=======
 +  case 112:
 +/* Line 1787 of yacc.c  */
 +#line 1164 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 118:
+ #line 1204 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string name((yyvsp[(3) - (3)].c));
+       std::string name((yyvsp[0].c));
        Msg::UndefineOnelabParameter(name);
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[0].c));
      }
+ #line 5581 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 112:
 +#line 1142 "Gmsh.y"
 +=======
 +  case 113:
 +/* Line 1787 of yacc.c  */
 +#line 1172 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 119:
+ #line 1212 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(20,20,sizeof(doubleXstring));
-       doubleXstring v = {(yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].c)};
+       doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
        List_Add((yyval.l), &v);
      }
+ #line 5591 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 113:
 +#line 1148 "Gmsh.y"
 +=======
 +  case 114:
 +/* Line 1787 of yacc.c  */
 +#line 1178 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 120:
+ #line 1218 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       doubleXstring v = {(yyvsp[(3) - (5)].d), (yyvsp[(5) - (5)].c)};
+       doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
        List_Add((yyval.l), &v);
      }
+ #line 5600 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 116:
 +#line 1160 "Gmsh.y"
 +=======
 +  case 117:
 +/* Line 1787 of yacc.c  */
 +#line 1190 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 123:
+ #line 1230 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(2) - (3)].c));
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
+       std::string key((yyvsp[-1].c));
+       for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
          double v;
-         List_Read((yyvsp[(3) - (3)].l), i, &v);
+         List_Read((yyvsp[0].l), i, &v);
          floatOptions[key].push_back(v);
        }
-       Free((yyvsp[(2) - (3)].c));
-       List_Delete((yyvsp[(3) - (3)].l));
+       Free((yyvsp[-1].c));
+       List_Delete((yyvsp[0].l));
      }
+ #line 5615 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 117:
 +#line 1171 "Gmsh.y"
 +=======
 +  case 118:
 +/* Line 1787 of yacc.c  */
 +#line 1201 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 124:
+ #line 1241 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(2) - (5)].c));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       std::string key((yyvsp[-3].c));
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          doubleXstring v;
-         List_Read((yyvsp[(4) - (5)].l), i, &v);
+         List_Read((yyvsp[-1].l), i, &v);
          floatOptions[key].push_back(v.d);
          charOptions[key].push_back(v.s);
        }
-       Free((yyvsp[(2) - (5)].c));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++)
-         Free(((doubleXstring*)List_Pointer((yyvsp[(4) - (5)].l), i))->s);
-       List_Delete((yyvsp[(4) - (5)].l));
+       Free((yyvsp[-3].c));
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+         Free(((doubleXstring*)List_Pointer((yyvsp[-1].l), i))->s);
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5633 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 118:
 +#line 1186 "Gmsh.y"
 +=======
 +  case 119:
 +/* Line 1787 of yacc.c  */
 +#line 1216 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 125:
+ #line 1256 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(2) - (3)].c));
-       std::string val((yyvsp[(3) - (3)].c));
+       std::string key((yyvsp[-1].c));
+       std::string val((yyvsp[0].c));
        charOptions[key].push_back(val);
-       Free((yyvsp[(2) - (3)].c));
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[-1].c));
+       Free((yyvsp[0].c));
      }
+ #line 5645 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 121:
 +#line 1202 "Gmsh.y"
 +=======
 +  case 122:
 +/* Line 1787 of yacc.c  */
 +#line 1232 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 128:
+ #line 1272 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(2) - (3)].c));
-       double val = (yyvsp[(3) - (3)].d);
+       std::string key((yyvsp[-1].c));
+       double val = (yyvsp[0].d);
        floatOptions[key].push_back(val);
-       Free((yyvsp[(2) - (3)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 5656 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 122:
 +#line 1210 "Gmsh.y"
 +=======
 +  case 123:
 +/* Line 1787 of yacc.c  */
 +#line 1240 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 129:
+ #line 1280 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string key((yyvsp[(2) - (3)].c));
-       std::string val((yyvsp[(3) - (3)].c));
+       std::string key((yyvsp[-1].c));
+       std::string val((yyvsp[0].c));
        charOptions[key].push_back(val);
-       Free((yyvsp[(2) - (3)].c));
-       Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[-1].c));
+       Free((yyvsp[0].c));
      }
+ #line 5668 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 123:
 +#line 1219 "Gmsh.y"
 +=======
 +  case 124:
 +/* Line 1787 of yacc.c  */
 +#line 1249 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 130:
+ #line 1289 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
+     {
+       std::string key("Macro");
+       std::string val((yyvsp[0].c));
+       charOptions[key].push_back(val);
+       Free((yyvsp[0].c));
+     }
+ #line 5679 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 131:
+ #line 1297 "Gmsh.y" /* yacc.c:1646  */
      {
-       std::string key((yyvsp[(2) - (5)].c));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       std::string key((yyvsp[-3].c));
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          char *s;
-         List_Read((yyvsp[(4) - (5)].l), i, &s);
+         List_Read((yyvsp[-1].l), i, &s);
          std::string val(s);
          Free(s);
          charOptions[key].push_back(val);
        }
-       Free((yyvsp[(2) - (5)].c));
-       List_Delete((yyvsp[(4) - (5)].l));
+       Free((yyvsp[-3].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 5696 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 124:
 +#line 1237 "Gmsh.y"
 +=======
 +  case 125:
 +/* Line 1787 of yacc.c  */
 +#line 1267 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 132:
+ #line 1315 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = (int)(yyvsp[(1) - (1)].d);
+       (yyval.i) = (int)(yyvsp[0].d);
      }
+ #line 5704 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 125:
 +#line 1241 "Gmsh.y"
 +=======
 +  case 126:
 +/* Line 1787 of yacc.c  */
 +#line 1271 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 133:
+ #line 1319 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.i) = GModel::current()->setPhysicalName
-         (std::string((yyvsp[(1) - (1)].c)), 0, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-       Free((yyvsp[(1) - (1)].c));
+         (std::string((yyvsp[0].c)), 0, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+       Free((yyvsp[0].c));
      }
+ #line 5714 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 126:
 +#line 1251 "Gmsh.y"
 +=======
 +  case 127:
 +/* Line 1787 of yacc.c  */
 +#line 1280 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 134:
+ #line 1325 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = (int)(yyvsp[(1) - (1)].d);
+       (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 0, (yyvsp[0].d));
+       Free((yyvsp[-2].c));
      }
+ #line 5723 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 127:
 +#line 1255 "Gmsh.y"
 +=======
 +  case 128:
 +/* Line 1787 of yacc.c  */
 +#line 1284 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 135:
+ #line 1333 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = GModel::current()->setPhysicalName
-         (std::string((yyvsp[(1) - (1)].c)), 1, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-       Free((yyvsp[(1) - (1)].c));
+       (yyval.i) = (int)(yyvsp[0].d);
      }
+ #line 5731 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 128:
 +#line 1267 "Gmsh.y"
 +=======
 +  case 129:
 +/* Line 1787 of yacc.c  */
 +#line 1293 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 136:
+ #line 1337 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = (int)(yyvsp[(1) - (1)].d);
+       (yyval.i) = GModel::current()->setPhysicalName
+         (std::string((yyvsp[0].c)), 1, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+       Free((yyvsp[0].c));
      }
+ #line 5741 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 129:
 +#line 1271 "Gmsh.y"
 +=======
 +  case 130:
 +/* Line 1787 of yacc.c  */
 +#line 1297 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 137:
+ #line 1343 "Gmsh.y" /* yacc.c:1646  */
+     {
+       (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 1, (yyvsp[0].d));
+       Free((yyvsp[-2].c));
+     }
+ #line 5750 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 138:
+ #line 1351 "Gmsh.y" /* yacc.c:1646  */
+     {
+       (yyval.i) = (int)(yyvsp[0].d);
+     }
+ #line 5758 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 139:
+ #line 1355 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.i) = GModel::current()->setPhysicalName
-         (std::string((yyvsp[(1) - (1)].c)), 2, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-       Free((yyvsp[(1) - (1)].c));
+         (std::string((yyvsp[0].c)), 2, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+       Free((yyvsp[0].c));
      }
+ #line 5768 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 130:
 +#line 1281 "Gmsh.y"
 +=======
 +  case 131:
 +/* Line 1787 of yacc.c  */
 +#line 1306 "Gmsh.y"
++=======
+   case 140:
+ #line 1361 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = (int)(yyvsp[(1) - (1)].d);
+       (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 2, (yyvsp[0].d));
+       Free((yyvsp[-2].c));
      }
+ #line 5777 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 132:
- /* Line 1787 of yacc.c  */
- #line 1310 "Gmsh.y"
+   case 141:
+ #line 1369 "Gmsh.y" /* yacc.c:1646  */
+     {
+       (yyval.i) = (int)(yyvsp[0].d);
+     }
+ #line 5785 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 142:
+ #line 1373 "Gmsh.y" /* yacc.c:1646  */
      {
        (yyval.i) = GModel::current()->setPhysicalName
-         (std::string((yyvsp[(1) - (1)].c)), 3, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-       Free((yyvsp[(1) - (1)].c));
+         (std::string((yyvsp[0].c)), 3, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+       Free((yyvsp[0].c));
      }
+ #line 5795 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 133:
- /* Line 1787 of yacc.c  */
- #line 1319 "Gmsh.y"
+   case 143:
+ #line 1379 "Gmsh.y" /* yacc.c:1646  */
+     {
+       (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 3, (yyvsp[0].d));
+       Free((yyvsp[-2].c));
+     }
+ #line 5804 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 144:
+ #line 1387 "Gmsh.y" /* yacc.c:1646  */
      {
        (yyval.l) = 0;
      }
@@@ -9633,22 -5830,21 +12011,28 @@@
      {
        for(int i = 0; i < 4; i++) (yyval.v)[i] = 0.;
      }
+ #line 5834 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 136:
- /* Line 1787 of yacc.c  */
- #line 1339 "Gmsh.y"
+   case 147:
+ #line 1407 "Gmsh.y" /* yacc.c:1646  */
      {
-       for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
+       for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[0].v)[i];
      }
+ #line 5842 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 137:
 +/* Line 1787 of yacc.c  */
 +#line 1349 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 148:
+ #line 1417 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindPoint(num)){
  	yymsg(0, "Point %d already exists", num);
        }
@@@ -9668,30 -5864,15 +12052,36 @@@
        }
        (yyval.s).Type = MSH_POINT;
        (yyval.s).Num = num;
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 131:
 +#line 1304 "Gmsh.y"
 +    {
 +      curPhysDim = 0;
 +    ;}
 +    break;
 +
 +  case 132:
 +#line 1308 "Gmsh.y"
 +=======
      }
+ #line 5869 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 138:
 +/* Line 1787 of yacc.c  */
 +#line 1372 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 149:
+ #line 1440 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].i);
-       int op = (yyvsp[(6) - (8)].i);
+       int num = (int)(yyvsp[-4].i);
+       int op = (yyvsp[-2].i);
        PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_POINT);
        if(p && op == 0){
  	yymsg(0, "Physical point %d already exists", num);
@@@ -9720,23 -5901,18 +12110,29 @@@
        (yyval.s).Type = MSH_PHYSICAL_POINT;
        (yyval.s).Num = num;
      }
+ #line 5905 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 133:
 +#line 1324 "Gmsh.y"
 +=======
 +  case 139:
 +/* Line 1787 of yacc.c  */
 +#line 1404 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 150:
+ #line 1472 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
  	double d;
- 	List_Read((yyvsp[(3) - (6)].l), i, &d);
+ 	List_Read((yyvsp[-3].l), i, &d);
  	Vertex *v = FindPoint((int)d);
  	if(v){
- 	  v->lc = (yyvsp[(5) - (6)].d);
+ 	  v->lc = (yyvsp[-1].d);
          }
  	else{
  	  GVertex *gv = GModel::current()->getVertexByTag((int)d);
@@@ -9749,18 -5925,13 +12145,24 @@@
        (yyval.s).Type = 0;
        (yyval.s).Num = 0;
      }
+ #line 5929 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 134:
 +#line 1346 "Gmsh.y"
 +=======
 +  case 140:
 +/* Line 1787 of yacc.c  */
 +#line 1427 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 151:
+ #line 1495 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9776,20 -5947,15 +12178,26 @@@
        (yyval.s).Type = MSH_SEGM_LINE;
        (yyval.s).Num = num;
      }
+ #line 5951 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 135:
 +#line 1364 "Gmsh.y"
 +=======
 +  case 141:
 +/* Line 1787 of yacc.c  */
 +#line 1445 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 152:
+ #line 1513 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for (int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for (int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	double dnum;
- 	List_Read((yyvsp[(3) - (4)].l), i, &dnum);
+ 	List_Read((yyvsp[-1].l), i, &dnum);
  	int num = (int) fabs(dnum);
  	Curve *c = FindCurve(num);
  	if (c){
@@@ -9806,18 -5972,13 +12214,24 @@@
  	}
        }
      }
+ #line 5976 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 136:
 +#line 1385 "Gmsh.y"
 +=======
 +  case 142:
 +/* Line 1787 of yacc.c  */
 +#line 1466 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 153:
+ #line 1534 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9833,18 -5994,13 +12247,24 @@@
        (yyval.s).Type = MSH_SEGM_SPLN;
        (yyval.s).Num = num;
      }
+ #line 5998 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 137:
 +#line 1403 "Gmsh.y"
 +=======
 +  case 143:
 +/* Line 1787 of yacc.c  */
 +#line 1484 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 154:
+ #line 1552 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (8)].d);
+       int num = (int)(yyvsp[-5].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9872,18 -6028,13 +12292,24 @@@
        (yyval.s).Type = MSH_SEGM_CIRC;
        (yyval.s).Num = num;
      }
+ #line 6032 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 138:
 +#line 1433 "Gmsh.y"
 +=======
 +  case 144:
 +/* Line 1787 of yacc.c  */
 +#line 1514 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 155:
+ #line 1582 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (8)].d);
+       int num = (int)(yyvsp[-5].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9911,18 -6062,13 +12337,24 @@@
        (yyval.s).Type = MSH_SEGM_ELLI;
        (yyval.s).Num = num;
      }
+ #line 6066 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 139:
 +#line 1463 "Gmsh.y"
 +=======
 +  case 145:
 +/* Line 1787 of yacc.c  */
 +#line 1544 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 156:
+ #line 1612 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9938,18 -6084,13 +12370,24 @@@
        (yyval.s).Type = MSH_SEGM_BSPLN;
        (yyval.s).Num = num;
      }
+ #line 6088 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 140:
 +#line 1481 "Gmsh.y"
 +=======
 +  case 146:
 +/* Line 1787 of yacc.c  */
 +#line 1562 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 157:
+ #line 1630 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -9965,22 -6106,17 +12403,28 @@@
        (yyval.s).Type = MSH_SEGM_BEZIER;
        (yyval.s).Num = num;
      }
+ #line 6110 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 141:
 +#line 1500 "Gmsh.y"
 +=======
 +  case 147:
 +/* Line 1787 of yacc.c  */
 +#line 1581 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 158:
+ #line 1649 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (11)].d);
-       if(List_Nbr((yyvsp[(6) - (11)].l)) + (int)(yyvsp[(10) - (11)].d) + 1 != List_Nbr((yyvsp[(8) - (11)].l))){
+       int num = (int)(yyvsp[-8].d);
+       if(List_Nbr((yyvsp[-5].l)) + (int)(yyvsp[-1].d) + 1 != List_Nbr((yyvsp[-3].l))){
  	yymsg(0, "Wrong definition of Nurbs Curve %d: "
  	      "got %d knots, need N + D + 1 = %d + %d + 1 = %d",
- 	      (int)(yyvsp[(3) - (11)].d), List_Nbr((yyvsp[(8) - (11)].l)), List_Nbr((yyvsp[(6) - (11)].l)), (int)(yyvsp[(10) - (11)].d), List_Nbr((yyvsp[(6) - (11)].l)) + (int)(yyvsp[(10) - (11)].d) + 1);
+ 	      (int)(yyvsp[-8].d), List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-5].l)), (int)(yyvsp[-1].d), List_Nbr((yyvsp[-5].l)) + (int)(yyvsp[-1].d) + 1);
        }
        else{
  	if(FindCurve(num)){
@@@ -10000,18 -6136,13 +12444,24 @@@
        (yyval.s).Type = MSH_SEGM_NURBS;
        (yyval.s).Num = num;
      }
+ #line 6140 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 142:
 +#line 1526 "Gmsh.y"
 +=======
 +  case 148:
 +/* Line 1787 of yacc.c  */
 +#line 1607 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 159:
+ #line 1675 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindEdgeLoop(num)){
  	yymsg(0, "Line loop %d already exists", num);
        }
@@@ -10027,18 -6158,13 +12477,24 @@@
        (yyval.s).Type = MSH_SEGM_LOOP;
        (yyval.s).Num = num;
      }
+ #line 6162 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 143:
 +#line 1544 "Gmsh.y"
 +=======
 +  case 149:
 +/* Line 1787 of yacc.c  */
 +#line 1625 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 160:
+ #line 1693 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindCurve(num)){
  	yymsg(0, "Curve %d already exists", num);
        }
@@@ -10050,33 -6176,18 +12506,39 @@@
  	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
  	CreateReversedCurve(c);
        }
-       List_Delete((yyvsp[(7) - (8)].l));
+       List_Delete((yyvsp[-1].l));
        (yyval.s).Type = MSH_SEGM_COMPOUND;
        (yyval.s).Num = num;
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 144:
 +#line 1562 "Gmsh.y"
 +    {
 +      curPhysDim = 1;
 +    ;}
 +    break;
 +
 +  case 145:
 +#line 1566 "Gmsh.y"
 +=======
      }
+ #line 6184 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 150:
 +/* Line 1787 of yacc.c  */
 +#line 1643 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 161:
+ #line 1711 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].i);
-       int op = (yyvsp[(6) - (8)].i);
+       int num = (int)(yyvsp[-4].i);
+       int op = (yyvsp[-2].i);
        PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_LINE);
        if(p && op == 0){
  	yymsg(0, "Physical line %d already exists", num);
@@@ -10105,18 -6216,13 +12567,24 @@@
        (yyval.s).Type = MSH_PHYSICAL_LINE;
        (yyval.s).Num = num;
      }
+ #line 6220 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 146:
 +#line 1585 "Gmsh.y"
 +=======
 +  case 151:
 +/* Line 1787 of yacc.c  */
 +#line 1678 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 162:
+ #line 1746 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindSurface(num)){
  	yymsg(0, "Surface %d already exists", num);
        }
@@@ -10132,18 -6238,13 +12600,24 @@@
        (yyval.s).Type = MSH_SURF_PLAN;
        (yyval.s).Num = num;
      }
+ #line 6242 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 147:
 +#line 1603 "Gmsh.y"
 +=======
 +  case 152:
 +/* Line 1787 of yacc.c  */
 +#line 1696 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 163:
+ #line 1764 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (9)].d), type = 0;
+       int num = (int)(yyvsp[-5].d), type = 0;
        if(FindSurface(num)){
  	yymsg(0, "Surface %d already exists", num);
        }
@@@ -10180,67 -6281,47 +12654,91 @@@
        (yyval.s).Type = type;
        (yyval.s).Num = num;
      }
+ #line 6285 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 148:
 +#line 1642 "Gmsh.y"
 +=======
 +  case 153:
 +/* Line 1787 of yacc.c  */
 +#line 1735 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 164:
+ #line 1803 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        myGmshSurface = 0;
        (yyval.s).Type = 0;
        (yyval.s).Num = 0;
      }
+ #line 6295 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 149:
 +#line 1648 "Gmsh.y"
 +=======
 +  case 154:
 +/* Line 1787 of yacc.c  */
 +#line 1741 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 165:
+ #line 1809 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       myGmshSurface = gmshSurface::getSurface((int)(yyvsp[(3) - (4)].d));
+       myGmshSurface = gmshSurface::getSurface((int)(yyvsp[-1].d));
        (yyval.s).Type = 0;
        (yyval.s).Num = 0;
      }
+ #line 6305 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 150:
 +#line 1654 "Gmsh.y"
 +=======
 +  case 155:
 +/* Line 1787 of yacc.c  */
 +#line 1747 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 166:
+ #line 1815 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (10)].d);
-       myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[(7) - (10)].c), (yyvsp[(8) - (10)].c), (yyvsp[(9) - (10)].c));
+       int num = (int)(yyvsp[-6].d);
+       myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[-3].c), (yyvsp[-2].c), (yyvsp[-1].c));
        (yyval.s).Type = 0;
        (yyval.s).Num = num;
      }
+ #line 6316 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 151:
 +#line 1661 "Gmsh.y"
 +=======
 +  case 156:
 +/* Line 1787 of yacc.c  */
 +#line 1754 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 167:
+ #line 1822 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
-       if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
+       int num = (int)(yyvsp[-4].d);
+       if (List_Nbr((yyvsp[-1].l)) != 2){
  	yymsg(0, "Sphere %d has to be defined using 2 points (center + "
- 	      "any point) and not %d", num, List_Nbr((yyvsp[(6) - (7)].l)));
+ 	      "any point) and not %d", num, List_Nbr((yyvsp[-1].l)));
        }
        else{
  	double p1,p2;
@@@ -10260,21 -6341,16 +12758,27 @@@
        (yyval.s).Type = 0;
        (yyval.s).Num = num;
      }
+ #line 6345 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 152:
 +#line 1686 "Gmsh.y"
 +=======
 +  case 157:
 +/* Line 1787 of yacc.c  */
 +#line 1779 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 168:
+ #line 1847 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
-       if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
+       int num = (int)(yyvsp[-4].d);
+       if (List_Nbr((yyvsp[-1].l)) != 2){
  	yymsg(0, "PolarSphere %d has to be defined using 2 points (center + "
- 	      "any point) and not %d", num, List_Nbr((yyvsp[(6) - (7)].l)));
+ 	      "any point) and not %d", num, List_Nbr((yyvsp[-1].l)));
        }
        else{
  	double p1,p2;
@@@ -10294,18 -6370,13 +12798,24 @@@
        (yyval.s).Type = 0;
        (yyval.s).Num = num;
      }
+ #line 6374 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 153:
 +#line 1711 "Gmsh.y"
 +=======
 +  case 158:
 +/* Line 1787 of yacc.c  */
 +#line 1804 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 169:
+ #line 1872 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindSurfaceLoop(num)){
  	yymsg(0, "Surface loop %d already exists", num);
        }
@@@ -10320,18 -6391,13 +12830,24 @@@
        (yyval.s).Type = MSH_SURF_LOOP;
        (yyval.s).Num = num;
      }
+ #line 6395 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 154:
 +#line 1728 "Gmsh.y"
 +=======
 +  case 159:
 +/* Line 1787 of yacc.c  */
 +#line 1821 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 170:
+ #line 1889 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindSurface(num)){
  	yymsg(0, "Surface %d already exists", num);
        }
@@@ -10348,18 -6414,13 +12864,24 @@@
        (yyval.s).Type = MSH_SURF_COMPOUND;
        (yyval.s).Num = num;
      }
+ #line 6418 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 155:
 +#line 1748 "Gmsh.y"
 +=======
 +  case 160:
 +/* Line 1787 of yacc.c  */
 +#line 1841 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 171:
+ #line 1909 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (12)].d);
+       int num = (int)(yyvsp[-8].d);
        if(FindSurface(num)){
  	yymsg(0, "Surface %d already exists", num);
        }
@@@ -10382,37 -6443,22 +12904,43 @@@
  
  	Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
        }
-       List_Delete((yyvsp[(7) - (12)].l));
-       for (int i = 0; i < List_Nbr((yyvsp[(10) - (12)].l)); i++)
-         List_Delete(*(List_T**)List_Pointer((yyvsp[(10) - (12)].l), i));
-       List_Delete((yyvsp[(10) - (12)].l));
-       Free((yyvsp[(8) - (12)].c));
+       List_Delete((yyvsp[-5].l));
+       for (int i = 0; i < List_Nbr((yyvsp[-2].l)); i++)
+         List_Delete(*(List_T**)List_Pointer((yyvsp[-2].l), i));
+       List_Delete((yyvsp[-2].l));
+       Free((yyvsp[-4].c));
        (yyval.s).Type = MSH_SURF_COMPOUND;
        (yyval.s).Num = num;
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 156:
 +#line 1781 "Gmsh.y"
 +    {
 +      curPhysDim = 2;
 +    ;}
 +    break;
 +
 +  case 157:
 +#line 1785 "Gmsh.y"
 +=======
      }
+ #line 6455 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 161:
 +/* Line 1787 of yacc.c  */
 +#line 1874 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 172:
+ #line 1942 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].i);
-       int op = (yyvsp[(6) - (8)].i);
+       int num = (int)(yyvsp[-4].i);
+       int op = (yyvsp[-2].i);
        PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE);
        if(p && op == 0){
  	yymsg(0, "Physical surface %d already exists", num);
@@@ -10441,19 -6487,14 +12969,25 @@@
        (yyval.s).Type = MSH_PHYSICAL_SURFACE;
        (yyval.s).Num = num;
      }
+ #line 6491 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 158:
 +#line 1805 "Gmsh.y"
 +=======
 +  case 162:
 +/* Line 1787 of yacc.c  */
 +#line 1910 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 173:
+ #line 1978 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindVolume(num)){
  	yymsg(0, "Volume %d already exists", num);
        }
@@@ -10468,18 -6509,13 +13002,24 @@@
        (yyval.s).Type = MSH_VOLUME;
        (yyval.s).Num = num;
      }
+ #line 6513 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 159:
 +#line 1823 "Gmsh.y"
 +=======
 +  case 163:
 +/* Line 1787 of yacc.c  */
 +#line 1928 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 174:
+ #line 1996 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (7)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindVolume(num)){
  	yymsg(0, "Volume %d already exists", num);
        }
@@@ -10494,54 -6530,34 +13034,66 @@@
        (yyval.s).Type = MSH_VOLUME;
        (yyval.s).Num = num;
      }
+ #line 6534 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 160:
 +#line 1840 "Gmsh.y"
 +=======
 +  case 164:
 +/* Line 1787 of yacc.c  */
 +#line 1945 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 175:
+ #line 2013 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].d);
+       int num = (int)(yyvsp[-4].d);
        if(FindVolume(num)){
  	yymsg(0, "Volume %d already exists", num);
        }
        else{
  	Volume *v = Create_Volume(num, MSH_VOLUME_COMPOUND);
-         for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++)
-           v->compound.push_back((int)*(double*)List_Pointer((yyvsp[(7) - (8)].l), i));
+         for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+           v->compound.push_back((int)*(double*)List_Pointer((yyvsp[-1].l), i));
  	Tree_Add(GModel::current()->getGEOInternals()->Volumes, &v);
        }
-       List_Delete((yyvsp[(7) - (8)].l));
+       List_Delete((yyvsp[-1].l));
        (yyval.s).Type = MSH_VOLUME_COMPOUND;
        (yyval.s).Num = num;
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 161:
 +#line 1856 "Gmsh.y"
 +    {
 +      curPhysDim = 3;
 +    ;}
 +    break;
 +
 +  case 162:
 +#line 1860 "Gmsh.y"
 +=======
      }
+ #line 6554 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 165:
 +/* Line 1787 of yacc.c  */
 +#line 1961 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 176:
+ #line 2029 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(4) - (8)].i);
-       int op = (yyvsp[(6) - (8)].i);
+       int num = (int)(yyvsp[-4].i);
+       int op = (yyvsp[-2].i);
        PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME);
        if(p && op == 0){
  	yymsg(0, "Physical volume %d already exists", num);
@@@ -10570,202 -6586,137 +13122,275 @@@
        (yyval.s).Type = MSH_PHYSICAL_VOLUME;
        (yyval.s).Num = num;
      }
+ #line 6590 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 163:
 +#line 1882 "Gmsh.y"
 +=======
 +  case 166:
 +/* Line 1787 of yacc.c  */
 +#line 1998 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 177:
+ #line 2066 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
-       (yyval.l) = (yyvsp[(4) - (5)].l);
+       TranslateShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-1].l));
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 6599 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 164:
 +#line 1887 "Gmsh.y"
 +=======
 +  case 167:
 +/* Line 1787 of yacc.c  */
 +#line 2003 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 178:
+ #line 2071 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       RotateShapes((yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d), (yyvsp[(10) - (11)].l));
-       (yyval.l) = (yyvsp[(10) - (11)].l);
+       RotateShapes((yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-1].l));
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 6608 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 165:
 +#line 1892 "Gmsh.y"
 +=======
 +  case 168:
 +/* Line 1787 of yacc.c  */
 +#line 2008 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 179:
+ #line 2076 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       SymmetryShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(2) - (5)].v)[3], (yyvsp[(4) - (5)].l));
-       (yyval.l) = (yyvsp[(4) - (5)].l);
+       SymmetryShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-3].v)[3], (yyvsp[-1].l));
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 6617 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 166:
 +#line 1897 "Gmsh.y"
 +=======
 +  case 169:
 +/* Line 1787 of yacc.c  */
 +#line 2013 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 180:
+ #line 2081 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].d), (yyvsp[(5) - (9)].d), (yyvsp[(5) - (9)].d), (yyvsp[(8) - (9)].l));
-       (yyval.l) = (yyvsp[(8) - (9)].l);
+       DilatShapes((yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-1].l));
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 6626 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 167:
 +#line 1902 "Gmsh.y"
 +=======
 +  case 170:
 +/* Line 1787 of yacc.c  */
 +#line 2018 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 181:
+ #line 2086 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].v)[0], (yyvsp[(5) - (9)].v)[1], (yyvsp[(5) - (9)].v)[2], (yyvsp[(8) - (9)].l));
-       (yyval.l) = (yyvsp[(8) - (9)].l);
+       DilatShapes((yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-1].l));
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 6635 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 168:
 +#line 1907 "Gmsh.y"
 +=======
 +  case 171:
 +/* Line 1787 of yacc.c  */
 +#line 2023 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 182:
+ #line 2091 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(3, 3, sizeof(Shape));
-       if(!strcmp((yyvsp[(1) - (4)].c), "Duplicata")){
-         for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       if(!strcmp((yyvsp[-3].c), "Duplicata")){
+         for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
            Shape TheShape;
-           List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+           List_Read((yyvsp[-1].l), i, &TheShape);
            CopyShape(TheShape.Type, TheShape.Num, &TheShape.Num);
            List_Add((yyval.l), &TheShape);
          }
        }
-       else if(!strcmp((yyvsp[(1) - (4)].c), "Boundary")){
-         BoundaryShapes((yyvsp[(3) - (4)].l), (yyval.l), false);
+       else if(!strcmp((yyvsp[-3].c), "Boundary")){
+         BoundaryShapes((yyvsp[-1].l), (yyval.l), false);
        }
-       else if(!strcmp((yyvsp[(1) - (4)].c), "CombinedBoundary")){
-         BoundaryShapes((yyvsp[(3) - (4)].l), (yyval.l), true);
+       else if(!strcmp((yyvsp[-3].c), "CombinedBoundary")){
+         BoundaryShapes((yyvsp[-1].l), (yyval.l), true);
        }
        else{
-         yymsg(0, "Unknown command on multiple shapes: '%s'", (yyvsp[(1) - (4)].c));
+         yymsg(0, "Unknown command on multiple shapes: '%s'", (yyvsp[-3].c));
        }
-       Free((yyvsp[(1) - (4)].c));
-       List_Delete((yyvsp[(3) - (4)].l));
+       Free((yyvsp[-3].c));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 6662 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 169:
 +#line 1930 "Gmsh.y"
 +=======
 +  case 172:
 +/* Line 1787 of yacc.c  */
 +#line 2046 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 183:
+ #line 2114 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       IntersectCurvesWithSurface((yyvsp[(4) - (9)].l), (int)(yyvsp[(8) - (9)].d), (yyval.l));
-       List_Delete((yyvsp[(4) - (9)].l));
+       IntersectCurvesWithSurface((yyvsp[-5].l), (int)(yyvsp[-1].d), (yyval.l));
+       List_Delete((yyvsp[-5].l));
      }
+ #line 6672 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 170:
 +#line 1936 "Gmsh.y"
 +=======
 +  case 173:
 +/* Line 1787 of yacc.c  */
 +#line 2052 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 184:
+ #line 2120 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape*));
-       List_T *tmp = ListOfDouble2ListOfInt((yyvsp[(7) - (9)].l));
-       List_Delete((yyvsp[(7) - (9)].l));
-       SplitCurve((int)(yyvsp[(4) - (9)].d), tmp, (yyval.l));
+       List_T *tmp = ListOfDouble2ListOfInt((yyvsp[-2].l));
+       List_Delete((yyvsp[-2].l));
+       SplitCurve((int)(yyvsp[-5].d), tmp, (yyval.l));
        List_Delete(tmp);
      }
+ #line 6684 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 171:
 +#line 1946 "Gmsh.y"
 +    { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
 +    break;
 +
 +  case 172:
 +#line 1947 "Gmsh.y"
 +    { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
 +    break;
 +
 +  case 173:
 +#line 1952 "Gmsh.y"
 +=======
 +  case 174:
 +/* Line 1787 of yacc.c  */
 +#line 2062 "Gmsh.y"
 +    { (yyval.l) = (yyvsp[(1) - (1)].l); }
++=======
+   case 185:
+ #line 2130 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.l) = (yyvsp[0].l); }
+ #line 6690 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      break;
  
-   case 175:
- /* Line 1787 of yacc.c  */
- #line 2063 "Gmsh.y"
-     { (yyval.l) = (yyvsp[(1) - (1)].l); }
+   case 186:
+ #line 2131 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.l) = (yyvsp[0].l); }
+ #line 6696 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 176:
 +/* Line 1787 of yacc.c  */
 +#line 2068 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 187:
+ #line 2136 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(3, 3, sizeof(Shape));
      }
+ #line 6704 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 174:
 +#line 1956 "Gmsh.y"
 +=======
 +  case 177:
 +/* Line 1787 of yacc.c  */
 +#line 2072 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 188:
+ #line 2140 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
+       List_Add((yyval.l), &(yyvsp[0].s));
      }
+ #line 6712 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 175:
 +#line 1960 "Gmsh.y"
 +=======
 +  case 178:
 +/* Line 1787 of yacc.c  */
 +#line 2076 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 189:
+ #line 2144 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
  	double d;
- 	List_Read((yyvsp[(4) - (6)].l), i, &d);
+ 	List_Read((yyvsp[-2].l), i, &d);
  	Shape TheShape;
  	TheShape.Num = (int)d;
  	Vertex *v = FindPoint(std::abs(TheShape.Num));
@@@ -10784,20 -6735,15 +13409,26 @@@
  	}
        }
      }
+ #line 6739 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 176:
 +#line 1983 "Gmsh.y"
 +=======
 +  case 179:
 +/* Line 1787 of yacc.c  */
 +#line 2099 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 190:
+ #line 2167 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
  	double d;
- 	List_Read((yyvsp[(4) - (6)].l), i, &d);
+ 	List_Read((yyvsp[-2].l), i, &d);
  	Shape TheShape;
  	TheShape.Num = (int)d;
  	Curve *c = FindCurve(std::abs(TheShape.Num));
@@@ -10816,20 -6762,15 +13447,26 @@@
  	}
        }
      }
+ #line 6766 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 177:
 +#line 2006 "Gmsh.y"
 +=======
 +  case 180:
 +/* Line 1787 of yacc.c  */
 +#line 2122 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 191:
+ #line 2190 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
  	double d;
- 	List_Read((yyvsp[(4) - (6)].l), i, &d);
+ 	List_Read((yyvsp[-2].l), i, &d);
  	Shape TheShape;
  	TheShape.Num = (int)d;
  	Surface *s = FindSurface(std::abs(TheShape.Num));
@@@ -10848,20 -6789,15 +13485,26 @@@
  	}
        }
      }
+ #line 6793 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 178:
 +#line 2029 "Gmsh.y"
 +=======
 +  case 181:
 +/* Line 1787 of yacc.c  */
 +#line 2145 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 192:
+ #line 2213 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
  	double d;
- 	List_Read((yyvsp[(4) - (6)].l), i, &d);
+ 	List_Read((yyvsp[-2].l), i, &d);
  	Shape TheShape;
  	TheShape.Num = (int)d;
  	Volume *v = FindVolume(std::abs(TheShape.Num));
@@@ -10880,20 -6816,15 +13523,26 @@@
  	}
        }
      }
+ #line 6820 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 179:
 +#line 2057 "Gmsh.y"
 +=======
 +  case 182:
 +/* Line 1787 of yacc.c  */
 +#line 2173 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 193:
+ #line 2241 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(List_Nbr((yyvsp[(7) - (8)].l)) == 4){
-         int t = (int)(yyvsp[(4) - (8)].d);
+       if(List_Nbr((yyvsp[-1].l)) == 4){
+         int t = (int)(yyvsp[-4].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -10907,22 -6838,17 +13556,28 @@@
          }
        }
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (8)].d));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-4].d));
  #endif
      }
+ #line 6845 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 180:
 +#line 2078 "Gmsh.y"
 +=======
 +  case 183:
 +/* Line 1787 of yacc.c  */
 +#line 2194 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 194:
+ #line 2262 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       int t = (int)(yyvsp[(4) - (10)].d);
+       int t = (int)(yyvsp[-6].d);
        if(FindLevelSet(t)){
  	yymsg(0, "Levelset %d already exists", t);
        }
@@@ -10940,25 -6866,20 +13595,31 @@@
          LevelSet *l = Create_LevelSet(ls->getTag(), ls);
          Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
        }
-       for(int i = 0; i < List_Nbr((yyvsp[(8) - (10)].l)); i++)
-         List_Delete(*(List_T**)List_Pointer((yyvsp[(8) - (10)].l), i));
-       List_Delete((yyvsp[(8) - (10)].l));
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++)
+         List_Delete(*(List_T**)List_Pointer((yyvsp[-2].l), i));
+       List_Delete((yyvsp[-2].l));
  #endif
      }
+ #line 6875 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 181:
 +#line 2105 "Gmsh.y"
 +=======
 +  case 184:
 +/* Line 1787 of yacc.c  */
 +#line 2221 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 195:
+ #line 2289 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(List_Nbr((yyvsp[(12) - (14)].l)) == 0){
-         int t = (int)(yyvsp[(4) - (14)].d);
+       if(List_Nbr((yyvsp[-2].l)) == 0){
+         int t = (int)(yyvsp[-10].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -10971,23 -6892,18 +13632,29 @@@
          }
        }
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (14)].d));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-10].d));
  #endif
      }
+ #line 6899 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 182:
 +#line 2126 "Gmsh.y"
 +=======
 +  case 185:
 +/* Line 1787 of yacc.c  */
 +#line 2242 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 196:
+ #line 2310 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(List_Nbr((yyvsp[(14) - (16)].l)) == 0){
-         int t = (int)(yyvsp[(4) - (16)].d);
+       if(List_Nbr((yyvsp[-2].l)) == 0){
+         int t = (int)(yyvsp[-12].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -11001,23 -6917,18 +13668,29 @@@
          }
        }
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (16)].d));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-12].d));
  #endif
      }
+ #line 6924 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 183:
 +#line 2147 "Gmsh.y"
 +=======
 +  case 186:
 +/* Line 1787 of yacc.c  */
 +#line 2263 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 197:
+ #line 2331 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(List_Nbr((yyvsp[(10) - (12)].l)) == 1){
-         int t = (int)(yyvsp[(4) - (12)].d);
+       if(List_Nbr((yyvsp[-2].l)) == 1){
+         int t = (int)(yyvsp[-8].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -11030,23 -6941,18 +13703,29 @@@
          }
        }
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (12)].d));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-8].d));
  #endif
      }
+ #line 6948 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 184:
 +#line 2167 "Gmsh.y"
 +=======
 +  case 187:
 +/* Line 1787 of yacc.c  */
 +#line 2283 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 198:
+ #line 2351 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(!strcmp((yyvsp[(2) - (8)].c), "Union")){
-         int t = (int)(yyvsp[(4) - (8)].d);
+       if(!strcmp((yyvsp[-6].c), "Union")){
+         int t = (int)(yyvsp[-4].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -11150,24 -7056,19 +13829,30 @@@
        }
  #endif
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (8)].d));
-       Free((yyvsp[(2) - (8)].c));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-4].d));
+       Free((yyvsp[-6].c));
  #endif
      }
+ #line 7064 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 185:
 +#line 2279 "Gmsh.y"
 +=======
 +  case 188:
 +/* Line 1787 of yacc.c  */
 +#line 2395 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 199:
+ #line 2463 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(!strcmp((yyvsp[(2) - (8)].c), "MathEval")){
-         int t = (int)(yyvsp[(4) - (8)].d);
+       if(!strcmp((yyvsp[-6].c), "MathEval")){
+         int t = (int)(yyvsp[-4].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -11179,23 -7080,18 +13864,29 @@@
        }
        else
          yymsg(0, "Wrong levelset definition");
-       Free((yyvsp[(2) - (8)].c)); Free((yyvsp[(7) - (8)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-1].c));
  #endif
      }
+ #line 7087 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 186:
 +#line 2298 "Gmsh.y"
 +=======
 +  case 189:
 +/* Line 1787 of yacc.c  */
 +#line 2414 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 200:
+ #line 2482 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(!strcmp((yyvsp[(2) - (6)].c), "CutMesh")){
-         int t = (int)(yyvsp[(4) - (6)].d);
+       if(!strcmp((yyvsp[-4].c), "CutMesh")){
+         int t = (int)(yyvsp[-2].d);
          GModel *GM = GModel::current();
          if(FindLevelSet(t)){
            GM->buildCutGModel(FindLevelSet(t)->ls, true, false);
@@@ -11226,23 -7122,18 +13917,29 @@@
        }
        else
          yymsg(0, "Wrong levelset definition");
-       Free((yyvsp[(2) - (6)].c));
+       Free((yyvsp[-4].c));
  #endif
      }
+ #line 7129 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 187:
 +#line 2337 "Gmsh.y"
 +=======
 +  case 190:
 +/* Line 1787 of yacc.c  */
 +#line 2453 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 201:
+ #line 2521 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_DINTEGRATION)
-       if(!strcmp((yyvsp[(2) - (14)].c), "Cylinder") && List_Nbr((yyvsp[(12) - (14)].l)) == 1){
-         int t = (int)(yyvsp[(4) - (14)].d);
+       if(!strcmp((yyvsp[-12].c), "Cylinder") && List_Nbr((yyvsp[-2].l)) == 1){
+         int t = (int)(yyvsp[-10].d);
          if(FindLevelSet(t)){
  	  yymsg(0, "Levelset %d already exists", t);
          }
@@@ -11337,82 -7228,62 +14034,106 @@@
          }
        }
        else
-         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (14)].d));
-       Free((yyvsp[(2) - (14)].c));
+         yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-10].d));
+       Free((yyvsp[-12].c));
  #endif
      }
+ #line 7236 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 188:
 +#line 2445 "Gmsh.y"
 +=======
 +  case 191:
 +/* Line 1787 of yacc.c  */
 +#line 2561 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 202:
+ #line 2629 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
  	DeleteShape(TheShape.Type, TheShape.Num);
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7249 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 189:
 +#line 2454 "Gmsh.y"
 +=======
 +  case 192:
 +/* Line 1787 of yacc.c  */
 +#line 2570 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 203:
+ #line 2638 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       GModel::current()->getFields()->deleteField((int)(yyvsp[(4) - (6)].d));
+       GModel::current()->getFields()->deleteField((int)(yyvsp[-2].d));
  #endif
      }
+ #line 7259 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 190:
 +#line 2460 "Gmsh.y"
 +=======
 +  case 193:
 +/* Line 1787 of yacc.c  */
 +#line 2576 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 204:
+ #line 2644 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (6)].c), "View")){
- 	int index = (int)(yyvsp[(4) - (6)].d);
+       if(!strcmp((yyvsp[-4].c), "View")){
+ 	int index = (int)(yyvsp[-2].d);
  	if(index >= 0 && index < (int)PView::list.size())
  	  delete PView::list[index];
  	else
  	  yymsg(0, "Unknown view %d", index);
        }
        else
- 	yymsg(0, "Unknown command 'Delete %s'", (yyvsp[(2) - (6)].c));
+ 	yymsg(0, "Unknown command 'Delete %s'", (yyvsp[-4].c));
  #endif
-       Free((yyvsp[(2) - (6)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 7278 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 191:
 +#line 2475 "Gmsh.y"
 +=======
 +  case 194:
 +/* Line 1787 of yacc.c  */
 +#line 2591 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 205:
+ #line 2659 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
+       if(!strcmp((yyvsp[-1].c), "Meshes") || !strcmp((yyvsp[-1].c), "All")){
          ClearProject();
        }
-       else if(!strcmp((yyvsp[(2) - (3)].c), "Model")){
+       else if(!strcmp((yyvsp[-1].c), "Model")){
  	GModel::current()->destroy(true); // destroy, but keep name/filename
  	GModel::current()->getGEOInternals()->destroy();
        }
@@@ -11428,185 -7299,148 +14149,258 @@@
          InitOptionsGUI(0);
        }
        else{
- 	if(gmsh_yysymbols.count((yyvsp[(2) - (3)].c)))
- 	  gmsh_yysymbols.erase((yyvsp[(2) - (3)].c));
+ 	if(gmsh_yysymbols.count((yyvsp[-1].c)))
+ 	  gmsh_yysymbols.erase((yyvsp[-1].c));
  	else
- 	  yymsg(0, "Unknown object or expression to delete '%s'", (yyvsp[(2) - (3)].c));
+ 	  yymsg(0, "Unknown object or expression to delete '%s'", (yyvsp[-1].c));
        }
-       Free((yyvsp[(2) - (3)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 7310 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 192:
 +#line 2503 "Gmsh.y"
 +=======
 +  case 195:
 +/* Line 1787 of yacc.c  */
 +#line 2619 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 206:
+ #line 2687 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (4)].c), "Empty") && !strcmp((yyvsp[(3) - (4)].c), "Views")){
+       if(!strcmp((yyvsp[-2].c), "Empty") && !strcmp((yyvsp[-1].c), "Views")){
  	for(int i = PView::list.size() - 1; i >= 0; i--)
  	  if(PView::list[i]->getData()->empty()) delete PView::list[i];
        }
        else
- 	yymsg(0, "Unknown command 'Delete %s %s'", (yyvsp[(2) - (4)].c), (yyvsp[(3) - (4)].c));
+ 	yymsg(0, "Unknown command 'Delete %s %s'", (yyvsp[-2].c), (yyvsp[-1].c));
  #endif
-       Free((yyvsp[(2) - (4)].c)); Free((yyvsp[(3) - (4)].c));
+       Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
      }
+ #line 7326 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 193:
 +#line 2520 "Gmsh.y"
 +=======
 +  case 196:
 +/* Line 1787 of yacc.c  */
 +#line 2636 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 207:
+ #line 2704 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
- 	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[(2) - (5)].u), false);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
+ 	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[-3].u), false);
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7339 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 194:
 +#line 2529 "Gmsh.y"
 +=======
 +  case 197:
 +/* Line 1787 of yacc.c  */
 +#line 2645 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 208:
+ #line 2713 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(5) - (6)].l), i, &TheShape);
- 	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[(3) - (6)].u), true);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
+ 	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[-3].u), true);
        }
-       List_Delete((yyvsp[(5) - (6)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7352 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 195:
 +#line 2543 "Gmsh.y"
 +=======
 +  case 198:
 +/* Line 1787 of yacc.c  */
 +#line 2659 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 209:
+ #line 2727 "Gmsh.y" /* yacc.c:1646  */
+     {
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+ 	Shape TheShape;
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
+ 	SetPartition(TheShape.Type, TheShape.Num, (yyvsp[-3].d));
+       }
+       List_Delete((yyvsp[-1].l));
+     }
+ #line 7365 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 210:
+ #line 2741 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        for(int i = 0; i < 4; i++)
- 	VisibilityShape((yyvsp[(2) - (3)].c), i, 1, false);
-       Free((yyvsp[(2) - (3)].c));
+ 	VisibilityShape((yyvsp[-1].c), i, 1, false);
+       Free((yyvsp[-1].c));
      }
+ #line 7375 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 196:
 +#line 2549 "Gmsh.y"
 +=======
 +  case 199:
 +/* Line 1787 of yacc.c  */
 +#line 2665 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 211:
+ #line 2747 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        for(int i = 0; i < 4; i++)
- 	VisibilityShape((yyvsp[(2) - (3)].c), i, 0, false);
-       Free((yyvsp[(2) - (3)].c));
+ 	VisibilityShape((yyvsp[-1].c), i, 0, false);
+       Free((yyvsp[-1].c));
      }
+ #line 7385 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 197:
 +#line 2555 "Gmsh.y"
 +=======
 +  case 200:
 +/* Line 1787 of yacc.c  */
 +#line 2671 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 212:
+ #line 2753 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
  	VisibilityShape(TheShape.Type, TheShape.Num, 1, false);
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7398 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 198:
 +#line 2564 "Gmsh.y"
 +=======
 +  case 201:
 +/* Line 1787 of yacc.c  */
 +#line 2680 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 213:
+ #line 2762 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
  	VisibilityShape(TheShape.Type, TheShape.Num, 1, true);
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7411 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 199:
 +#line 2573 "Gmsh.y"
 +=======
 +  case 202:
 +/* Line 1787 of yacc.c  */
 +#line 2689 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 214:
+ #line 2771 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
  	VisibilityShape(TheShape.Type, TheShape.Num, 0, false);
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7424 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 200:
 +#line 2582 "Gmsh.y"
 +=======
 +  case 203:
 +/* Line 1787 of yacc.c  */
 +#line 2698 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 215:
+ #line 2780 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
  	Shape TheShape;
- 	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
+ 	List_Read((yyvsp[-1].l), i, &TheShape);
  	VisibilityShape(TheShape.Type, TheShape.Num, 0, true);
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7437 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 201:
 +#line 2596 "Gmsh.y"
 +=======
 +  case 204:
 +/* Line 1787 of yacc.c  */
 +#line 2712 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 216:
+ #line 2794 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
-         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+       if(!strcmp((yyvsp[-2].c), "Include")){
+         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
  	Msg::StatusBar(true, "Reading '%s'...", tmp.c_str());
  	// Warning: we explicitly ask ParseFile not to fclose() the included
          // file, in order to allow user functions definitions in these files.
@@@ -11625,57 -7459,49 +14419,68 @@@
  	// (fixes bug where we would have no geometry in the picture if
  	// the print command is in the same file as the geometry)
  	GModel::current()->importGEOInternals();
-         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
  	CreateOutputFile(tmp, CTX::instance()->print.fileFormat);
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "Save")){
+       else if(!strcmp((yyvsp[-2].c), "Save")){
  	GModel::current()->importGEOInternals();
-         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
  	CreateOutputFile(tmp, CTX::instance()->mesh.fileFormat);
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "Merge") || !strcmp((yyvsp[(1) - (3)].c), "MergeWithBoundingBox")){
+       else if(!strcmp((yyvsp[-2].c), "Merge") || !strcmp((yyvsp[-2].c), "MergeWithBoundingBox")){
  	// MergeWithBoundingBox is deprecated
-         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
  	MergeFile(tmp, true);
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "NonBlockingSystemCall")){
- 	SystemCall((yyvsp[(2) - (3)].c));
+       else if(!strcmp((yyvsp[-2].c), "NonBlockingSystemCall")){
+ 	SystemCall((yyvsp[-1].c));
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "System") || !strcmp((yyvsp[(1) - (3)].c), "SystemCall")){
- 	SystemCall((yyvsp[(2) - (3)].c), true);
+       else if(!strcmp((yyvsp[-2].c), "System") || !strcmp((yyvsp[-2].c), "SystemCall")){
+ 	SystemCall((yyvsp[-1].c), true);
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "SetName")){
- 	GModel::current()->setName((yyvsp[(2) - (3)].c));
+       else if(!strcmp((yyvsp[-2].c), "SetName")){
+ 	GModel::current()->setName((yyvsp[-1].c));
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "CreateDir")){
-         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+       else if(!strcmp((yyvsp[-2].c), "CreateDir")){
+         std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
  	CreateSingleDir(tmp);
        }
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +=======
 +      else if(!strcmp((yyvsp[(1) - (3)].c), "OnelabRun")){
 +        Msg::RunOnelabClient((yyvsp[(2) - (3)].c));
++=======
+       else if(!strcmp((yyvsp[-2].c), "OnelabRun")){
+         Msg::RunOnelabClient((yyvsp[-1].c));
++>>>>>>> upstream/2.10.1+dfsg1
        }
 +>>>>>>> upstream/2.9.3+dfsg1
        else{
- 	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (3)].c));
+ 	yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
        }
-       Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(2) - (3)].c));
+       Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
      }
+ #line 7497 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 202:
 +#line 2649 "Gmsh.y"
 +=======
 +  case 205:
 +/* Line 1787 of yacc.c  */
 +#line 2768 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 217:
+ #line 2850 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int n = List_Nbr((yyvsp[(3) - (5)].l));
+       int n = List_Nbr((yyvsp[-2].l));
        if(n == 1){
-         char *s; List_Read((yyvsp[(3) - (5)].l), 0, &s);
+         char *s; List_Read((yyvsp[-2].l), 0, &s);
          Msg::RunOnelabClient(s);
          Free(s);
        }
@@@ -11706,52 -7532,42 +14511,64 @@@
  	  yymsg(0, "Unknown view %d", index);
        }
        else
- 	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (7)].c));
+ 	yymsg(0, "Unknown command '%s'", (yyvsp[-6].c));
  #endif
-       Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(2) - (7)].c)); Free((yyvsp[(6) - (7)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-1].c));
      }
+ #line 7540 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 203:
 +#line 2666 "Gmsh.y"
 +=======
 +  case 207:
 +/* Line 1787 of yacc.c  */
 +#line 2803 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 219:
+ #line 2885 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST) && defined(HAVE_MESH)
-       if(!strcmp((yyvsp[(1) - (7)].c), "Background") && !strcmp((yyvsp[(2) - (7)].c), "Mesh")  && !strcmp((yyvsp[(3) - (7)].c), "View")){
- 	int index = (int)(yyvsp[(5) - (7)].d);
+       if(!strcmp((yyvsp[-6].c), "Background") && !strcmp((yyvsp[-5].c), "Mesh")  && !strcmp((yyvsp[-4].c), "View")){
+ 	int index = (int)(yyvsp[-2].d);
  	if(index >= 0 && index < (int)PView::list.size())
  	  GModel::current()->getFields()->setBackgroundMesh(index);
  	else
  	  yymsg(0, "Unknown view %d", index);
        }
        else
- 	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (7)].c));
+ 	yymsg(0, "Unknown command '%s'", (yyvsp[-6].c));
  #endif
-       Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(2) - (7)].c)); Free((yyvsp[(3) - (7)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
      }
+ #line 7559 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 204:
 +#line 2681 "Gmsh.y"
 +=======
 +  case 208:
 +/* Line 1787 of yacc.c  */
 +#line 2818 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 220:
+ #line 2900 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
- 	SleepInSeconds((yyvsp[(2) - (3)].d));
+       if(!strcmp((yyvsp[-2].c), "Sleep")){
+ 	SleepInSeconds((yyvsp[-1].d));
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "Remesh")){
+       else if(!strcmp((yyvsp[-2].c), "Remesh")){
  	yymsg(0, "Surface remeshing must be reinterfaced");
        }
-       else if(!strcmp((yyvsp[(1) - (3)].c), "Mesh")){
+       else if(!strcmp((yyvsp[-2].c), "Mesh")){
  	int lock = CTX::instance()->lock;
  	CTX::instance()->lock = 0;
  	GModel::current()->importGEOInternals();
@@@ -11759,160 -7575,124 +14576,223 @@@
  	CTX::instance()->lock = lock;
        }
        else
- 	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (3)].c));
-       Free((yyvsp[(1) - (3)].c));
+ 	yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
+       Free((yyvsp[-2].c));
      }
+ #line 7582 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 205:
 +#line 2700 "Gmsh.y"
 +=======
 +  case 209:
 +/* Line 1787 of yacc.c  */
 +#line 2837 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 221:
+ #line 2919 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_PLUGINS)
         try {
- 	 PluginManager::instance()->action((yyvsp[(3) - (7)].c), (yyvsp[(6) - (7)].c), 0);
+ 	 PluginManager::instance()->action((yyvsp[-4].c), (yyvsp[-1].c), 0);
         }
         catch(...) {
- 	 yymsg(0, "Unknown action '%s' or plugin '%s'", (yyvsp[(6) - (7)].c), (yyvsp[(3) - (7)].c));
+ 	 yymsg(0, "Unknown action '%s' or plugin '%s'", (yyvsp[-1].c), (yyvsp[-4].c));
         }
  #endif
-        Free((yyvsp[(3) - (7)].c)); Free((yyvsp[(6) - (7)].c));
+        Free((yyvsp[-4].c)); Free((yyvsp[-1].c));
       }
+ #line 7598 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 206:
 +#line 2712 "Gmsh.y"
 +=======
 +  case 210:
 +/* Line 1787 of yacc.c  */
 +#line 2849 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 222:
+ #line 2931 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_POST)
-       if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromAllViews"))
+       if(!strcmp((yyvsp[-1].c), "ElementsFromAllViews"))
  	PView::combine(false, 1, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromVisibleViews"))
+       else if(!strcmp((yyvsp[-1].c), "ElementsFromVisibleViews"))
  	PView::combine(false, 0, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "ElementsByViewName"))
+       else if(!strcmp((yyvsp[-1].c), "ElementsByViewName"))
  	PView::combine(false, 2, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsFromAllViews"))
+       else if(!strcmp((yyvsp[-1].c), "TimeStepsFromAllViews"))
  	PView::combine(true, 1, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsFromVisibleViews"))
+       else if(!strcmp((yyvsp[-1].c), "TimeStepsFromVisibleViews"))
  	PView::combine(true, 0, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsByViewName"))
+       else if(!strcmp((yyvsp[-1].c), "TimeStepsByViewName"))
  	PView::combine(true, 2, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "Views"))
+       else if(!strcmp((yyvsp[-1].c), "Views"))
  	PView::combine(false, 1, CTX::instance()->post.combineRemoveOrig);
-       else if(!strcmp((yyvsp[(2) - (3)].c), "TimeSteps"))
+       else if(!strcmp((yyvsp[-1].c), "TimeSteps"))
  	PView::combine(true, 2, CTX::instance()->post.combineRemoveOrig);
        else
  	yymsg(0, "Unknown 'Combine' command");
  #endif
-       Free((yyvsp[(2) - (3)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 7626 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 207:
 +#line 2736 "Gmsh.y"
 +=======
 +  case 211:
 +/* Line 1787 of yacc.c  */
 +#line 2873 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 223:
+ #line 2955 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        Msg::Exit(0);
      }
+ #line 7634 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 208:
 +#line 2740 "Gmsh.y"
 +=======
 +  case 212:
 +/* Line 1787 of yacc.c  */
 +#line 2877 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 224:
+ #line 2959 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        gmsh_yyerrorstate = 999; // this will be checked when yyparse returns
        YYABORT;
      }
+ #line 7643 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 209:
 +#line 2745 "Gmsh.y"
 +=======
 +  case 213:
 +/* Line 1787 of yacc.c  */
 +#line 2882 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 225:
+ #line 2964 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        // FIXME: this is a hack to force a transfer from the old DB to
        // the new DB. This will become unnecessary if/when we fill the
        // GModel directly during parsing.
        GModel::current()->importGEOInternals();
      }
+ #line 7654 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 210:
 +#line 2752 "Gmsh.y"
 +=======
 +  case 214:
 +/* Line 1787 of yacc.c  */
 +#line 2889 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 226:
+ #line 2971 "Gmsh.y" /* yacc.c:1646  */
+     {
+       new GModel();
+       GModel::current(GModel::list.size() - 1);
+     }
+ #line 7663 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 227:
+ #line 2976 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        CTX::instance()->forcedBBox = 0;
        GModel::current()->importGEOInternals();
        SetBoundingBox();
      }
+ #line 7673 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 211:
 +#line 2758 "Gmsh.y"
 +=======
 +  case 215:
 +/* Line 1787 of yacc.c  */
 +#line 2895 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 228:
+ #line 2982 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        CTX::instance()->forcedBBox = 1;
-       SetBoundingBox((yyvsp[(3) - (15)].d), (yyvsp[(5) - (15)].d), (yyvsp[(7) - (15)].d), (yyvsp[(9) - (15)].d), (yyvsp[(11) - (15)].d), (yyvsp[(13) - (15)].d));
+       SetBoundingBox((yyvsp[-12].d), (yyvsp[-10].d), (yyvsp[-8].d), (yyvsp[-6].d), (yyvsp[-4].d), (yyvsp[-2].d));
      }
+ #line 7682 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 212:
 +#line 2763 "Gmsh.y"
 +=======
 +  case 216:
 +/* Line 1787 of yacc.c  */
 +#line 2900 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 229:
+ #line 2987 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_OPENGL)
        drawContext::global()->draw();
  #endif
      }
+ #line 7692 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 213:
 +#line 2769 "Gmsh.y"
 +=======
 +  case 217:
 +/* Line 1787 of yacc.c  */
 +#line 2906 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 230:
+ #line 2993 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_OPENGL)
       CTX::instance()->mesh.changed = ENT_ALL;
@@@ -11920,56 -7700,36 +14800,80 @@@
         PView::list[index]->setChanged(true);
  #endif
      }
+ #line 7704 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 214:
 +#line 2777 "Gmsh.y"
 +=======
 +  case 218:
 +/* Line 1787 of yacc.c  */
 +#line 2914 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 231:
+ #line 3001 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        GModel::current()->createTopologyFromMesh();
      }
+ #line 7712 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 215:
 +#line 2781 "Gmsh.y"
 +=======
 +  case 219:
 +/* Line 1787 of yacc.c  */
 +#line 2918 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 232:
+ #line 3005 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        GModel::current()->createTopologyFromMesh(1);
      }
+ #line 7720 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 216:
 +#line 2785 "Gmsh.y"
 +=======
 +  case 220:
 +/* Line 1787 of yacc.c  */
 +#line 2922 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 233:
+ #line 3009 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        GModel::current()->importGEOInternals();
        GModel::current()->refineMesh(CTX::instance()->mesh.secondOrderLinear);
      }
+ #line 7729 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 217:
 +#line 2791 "Gmsh.y"
 +=======
 +  case 221:
 +/* Line 1787 of yacc.c  */
 +#line 2928 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 234:
+ #line 3015 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int lock = CTX::instance()->lock;
        CTX::instance()->lock = 0;
@@@ -12016,48 -7776,38 +14920,60 @@@
            }
          }
        }
-       List_Delete((yyvsp[(3) - (16)].l));
-       List_Delete((yyvsp[(6) - (16)].l));
-       for(int i = 0; i < List_Nbr((yyvsp[(9) - (16)].l)); i++)
-         List_Delete(*(List_T**)List_Pointer((yyvsp[(9) - (16)].l), i));
-       List_Delete((yyvsp[(9) - (16)].l));
+       List_Delete((yyvsp[-13].l));
+       List_Delete((yyvsp[-10].l));
+       for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++)
+         List_Delete(*(List_T**)List_Pointer((yyvsp[-7].l), i));
+       List_Delete((yyvsp[-7].l));
        CTX::instance()->lock = lock;
      }
+ #line 7787 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 218:
 +#line 2845 "Gmsh.y"
 +=======
 +  case 222:
 +/* Line 1787 of yacc.c  */
 +#line 2982 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 235:
+ #line 3069 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
  #if defined(HAVE_MESH)
-       SetOrderN(GModel::current(), (yyvsp[(2) - (3)].d), CTX::instance()->mesh.secondOrderLinear,
+       SetOrderN(GModel::current(), (yyvsp[-1].d), CTX::instance()->mesh.secondOrderLinear,
                  CTX::instance()->mesh.secondOrderIncomplete,
                  CTX::instance()->mesh.meshOnlyVisible);
  #endif
      }
+ #line 7799 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 219:
 +#line 2858 "Gmsh.y"
 +=======
 +  case 223:
 +/* Line 1787 of yacc.c  */
 +#line 2995 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 236:
+ #line 3082 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
-       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (6)].d);
+       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-3].d);
+       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-1].d);
        LoopControlVariablesTab[ImbricatedLoop][2] = 1.0;
-       LoopControlVariablesNameTab[ImbricatedLoop] = NULL;
+       LoopControlVariablesNameTab[ImbricatedLoop] = "";
        gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
        yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-       if((yyvsp[(3) - (6)].d) > (yyvsp[(5) - (6)].d))
+       if((yyvsp[-3].d) > (yyvsp[-1].d))
  	skip_until("For", "EndFor");
        else
  	ImbricatedLoop++;
@@@ -12066,24 -7816,19 +14982,30 @@@
  	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
        }
      }
+ #line 7820 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 220:
 +#line 2875 "Gmsh.y"
 +=======
 +  case 224:
 +/* Line 1787 of yacc.c  */
 +#line 3012 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 237:
+ #line 3099 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
-       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (8)].d);
-       LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[(7) - (8)].d);
-       LoopControlVariablesNameTab[ImbricatedLoop] = NULL;
+       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-5].d);
+       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-3].d);
+       LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[-1].d);
+       LoopControlVariablesNameTab[ImbricatedLoop] = "";
        gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
        yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-       if(((yyvsp[(7) - (8)].d) > 0. && (yyvsp[(3) - (8)].d) > (yyvsp[(5) - (8)].d)) || ((yyvsp[(7) - (8)].d) < 0. && (yyvsp[(3) - (8)].d) < (yyvsp[(5) - (8)].d)))
+       if(((yyvsp[-1].d) > 0. && (yyvsp[-5].d) > (yyvsp[-3].d)) || ((yyvsp[-1].d) < 0. && (yyvsp[-5].d) < (yyvsp[-3].d)))
  	skip_until("For", "EndFor");
        else
  	ImbricatedLoop++;
@@@ -12092,28 -7837,23 +15014,34 @@@
  	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
        }
      }
+ #line 7841 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 221:
 +#line 2892 "Gmsh.y"
 +=======
 +  case 225:
 +/* Line 1787 of yacc.c  */
 +#line 3029 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 238:
+ #line 3116 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
-       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (8)].d);
+       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-3].d);
+       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-1].d);
        LoopControlVariablesTab[ImbricatedLoop][2] = 1.0;
-       LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[(2) - (8)].c);
-       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (8)].c)]);
+       LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[-6].c);
+       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-6].c)]);
        s.list = false;
        s.value.resize(1);
-       s.value[0] = (yyvsp[(5) - (8)].d);
+       s.value[0] = (yyvsp[-3].d);
        gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
        yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-       if((yyvsp[(5) - (8)].d) > (yyvsp[(7) - (8)].d))
+       if((yyvsp[-3].d) > (yyvsp[-1].d))
  	skip_until("For", "EndFor");
        else
  	ImbricatedLoop++;
@@@ -12121,29 -7861,25 +15049,42 @@@
  	yymsg(0, "Reached maximum number of imbricated loops");
  	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
        }
+       Free((yyvsp[-6].c));
      }
+ #line 7867 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 222:
 +#line 2913 "Gmsh.y"
 +=======
 +  case 226:
 +/* Line 1787 of yacc.c  */
 +#line 3050 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
 +    {
 +      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
 +      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (10)].d);
 +      LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[(9) - (10)].d);
 +      LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[(2) - (10)].c);
 +      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (10)].c)]);
++=======
+   case 239:
+ #line 3138 "Gmsh.y" /* yacc.c:1646  */
+     {
+       LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-5].d);
+       LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-3].d);
+       LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[-1].d);
+       LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[-8].c);
+       gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-8].c)]);
++>>>>>>> upstream/2.10.1+dfsg1
        s.list = false;
        s.value.resize(1);
-       s.value[0] = (yyvsp[(5) - (10)].d);
+       s.value[0] = (yyvsp[-5].d);
        gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
        yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-       if(((yyvsp[(9) - (10)].d) > 0. && (yyvsp[(5) - (10)].d) > (yyvsp[(7) - (10)].d)) || ((yyvsp[(9) - (10)].d) < 0. && (yyvsp[(5) - (10)].d) < (yyvsp[(7) - (10)].d)))
+       if(((yyvsp[-1].d) > 0. && (yyvsp[-5].d) > (yyvsp[-3].d)) || ((yyvsp[-1].d) < 0. && (yyvsp[-5].d) < (yyvsp[-3].d)))
  	skip_until("For", "EndFor");
        else
  	ImbricatedLoop++;
@@@ -12151,17 -7887,13 +15092,24 @@@
  	yymsg(0, "Reached maximum number of imbricated loops");
  	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
        }
+       Free((yyvsp[-8].c));
      }
+ #line 7893 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 223:
 +#line 2934 "Gmsh.y"
 +=======
 +  case 227:
 +/* Line 1787 of yacc.c  */
 +#line 3071 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 240:
+ #line 3160 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        if(ImbricatedLoop <= 0){
  	yymsg(0, "Invalid For/EndFor loop");
@@@ -12196,716 -7928,486 +15144,992 @@@
  	  ImbricatedLoop--;
        }
      }
+ #line 7932 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 224:
 +#line 2969 "Gmsh.y"
 +=======
 +  case 228:
 +/* Line 1787 of yacc.c  */
 +#line 3106 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 241:
+ #line 3195 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        if(!FunctionManager::Instance()->createFunction
-          (std::string((yyvsp[(2) - (2)].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
- 	yymsg(0, "Redefinition of function %s", (yyvsp[(2) - (2)].c));
+          (std::string((yyvsp[0].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+ 	yymsg(0, "Redefinition of function %s", (yyvsp[0].c));
        skip_until(NULL, "Return");
-       Free((yyvsp[(2) - (2)].c));
+       Free((yyvsp[0].c));
      }
+ #line 7944 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 225:
 +#line 2977 "Gmsh.y"
 +=======
 +  case 229:
 +/* Line 1787 of yacc.c  */
 +#line 3114 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 242:
+ #line 3203 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        if(!FunctionManager::Instance()->leaveFunction
           (&gmsh_yyin, gmsh_yyname, gmsh_yylineno))
  	yymsg(0, "Error while exiting function");
      }
+ #line 7954 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 226:
 +#line 2983 "Gmsh.y"
 +=======
 +  case 230:
 +/* Line 1787 of yacc.c  */
 +#line 3120 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 243:
+ #line 3209 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        if(!FunctionManager::Instance()->enterFunction
-          (std::string((yyvsp[(2) - (3)].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
- 	yymsg(0, "Unknown function %s", (yyvsp[(2) - (3)].c));
-       Free((yyvsp[(2) - (3)].c));
+          (std::string((yyvsp[-1].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+ 	yymsg(0, "Unknown function %s", (yyvsp[-1].c));
+       Free((yyvsp[-1].c));
      }
+ #line 7965 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 227:
 +#line 2990 "Gmsh.y"
 +=======
 +  case 231:
 +/* Line 1787 of yacc.c  */
 +#line 3127 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 244:
+ #line 3216 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].d)) skip_until("If", "EndIf");
+       if(!(yyvsp[-1].d)) skip_until("If", "EndIf");
      }
+ #line 7973 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 228:
 +#line 2994 "Gmsh.y"
 +=======
 +  case 232:
 +/* Line 1787 of yacc.c  */
 +#line 3131 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 245:
+ #line 3220 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
      }
+ #line 7980 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 229:
 +#line 3003 "Gmsh.y"
 +=======
 +  case 233:
 +/* Line 1787 of yacc.c  */
 +#line 3140 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 246:
+ #line 3229 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (5)].l),
- 		    (yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShapes(TRANSLATE, (yyvsp[-1].l),
+ 		    (yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		    NULL, (yyval.l));
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 7992 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 230:
 +#line 3011 "Gmsh.y"
 +=======
 +  case 234:
 +/* Line 1787 of yacc.c  */
 +#line 3148 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 247:
+ #line 3237 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(ROTATE, (yyvsp[(10) - (11)].l),
- 		    0., 0., 0., (yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d),
+       ExtrudeShapes(ROTATE, (yyvsp[-1].l),
+ 		    0., 0., 0., (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
  		    NULL, (yyval.l));
-       List_Delete((yyvsp[(10) - (11)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 8004 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 231:
 +#line 3019 "Gmsh.y"
 +=======
 +  case 235:
 +/* Line 1787 of yacc.c  */
 +#line 3156 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 248:
+ #line 3245 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (13)].l),
- 		    (yyvsp[(3) - (13)].v)[0], (yyvsp[(3) - (13)].v)[1], (yyvsp[(3) - (13)].v)[2], (yyvsp[(5) - (13)].v)[0], (yyvsp[(5) - (13)].v)[1], (yyvsp[(5) - (13)].v)[2], (yyvsp[(7) - (13)].v)[0], (yyvsp[(7) - (13)].v)[1], (yyvsp[(7) - (13)].v)[2], (yyvsp[(9) - (13)].d),
+       ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[-1].l),
+ 		    (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
  		    NULL, (yyval.l));
-       List_Delete((yyvsp[(12) - (13)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 8016 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 232:
 +#line 3027 "Gmsh.y"
 +=======
 +  case 236:
 +/* Line 1787 of yacc.c  */
 +#line 3164 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 249:
+ #line 3253 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8026 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 233:
 +#line 3033 "Gmsh.y"
 +=======
 +  case 237:
 +/* Line 1787 of yacc.c  */
 +#line 3170 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 250:
+ #line 3259 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (7)].l),
- 		    (yyvsp[(2) - (7)].v)[0], (yyvsp[(2) - (7)].v)[1], (yyvsp[(2) - (7)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShapes(TRANSLATE, (yyvsp[-3].l),
+ 		    (yyvsp[-5].v)[0], (yyvsp[-5].v)[1], (yyvsp[-5].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		    &extr, (yyval.l));
-       List_Delete((yyvsp[(4) - (7)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 8038 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 234:
 +#line 3041 "Gmsh.y"
 +=======
 +  case 238:
 +/* Line 1787 of yacc.c  */
 +#line 3178 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 251:
+ #line 3267 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8048 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 235:
 +#line 3047 "Gmsh.y"
 +=======
 +  case 239:
 +/* Line 1787 of yacc.c  */
 +#line 3184 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 252:
+ #line 3273 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(ROTATE, (yyvsp[(10) - (13)].l),
- 		    0., 0., 0., (yyvsp[(3) - (13)].v)[0], (yyvsp[(3) - (13)].v)[1], (yyvsp[(3) - (13)].v)[2], (yyvsp[(5) - (13)].v)[0], (yyvsp[(5) - (13)].v)[1], (yyvsp[(5) - (13)].v)[2], (yyvsp[(7) - (13)].d),
+       ExtrudeShapes(ROTATE, (yyvsp[-3].l),
+ 		    0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		    &extr, (yyval.l));
-       List_Delete((yyvsp[(10) - (13)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 8060 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 236:
 +#line 3055 "Gmsh.y"
 +=======
 +  case 240:
 +/* Line 1787 of yacc.c  */
 +#line 3192 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
-     {
++=======
+   case 253:
+ #line 3281 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
+     {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8070 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 237:
 +#line 3061 "Gmsh.y"
 +=======
 +  case 241:
 +/* Line 1787 of yacc.c  */
 +#line 3198 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 254:
+ #line 3287 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (15)].l),
- 		    (yyvsp[(3) - (15)].v)[0], (yyvsp[(3) - (15)].v)[1], (yyvsp[(3) - (15)].v)[2], (yyvsp[(5) - (15)].v)[0], (yyvsp[(5) - (15)].v)[1], (yyvsp[(5) - (15)].v)[2], (yyvsp[(7) - (15)].v)[0], (yyvsp[(7) - (15)].v)[1], (yyvsp[(7) - (15)].v)[2], (yyvsp[(9) - (15)].d),
+       ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[-3].l),
+ 		    (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		    &extr, (yyval.l));
-       List_Delete((yyvsp[(12) - (15)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 8082 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 238:
 +#line 3069 "Gmsh.y"
 +=======
 +  case 242:
 +/* Line 1787 of yacc.c  */
 +#line 3206 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 255:
+ #line 3295 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8092 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 239:
 +#line 3075 "Gmsh.y"
 +=======
 +  case 243:
 +/* Line 1787 of yacc.c  */
 +#line 3212 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 256:
+ #line 3301 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[(3) - (6)].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[-3].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
  		    &extr, (yyval.l));
-       List_Delete((yyvsp[(3) - (6)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 8103 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 240:
 +#line 3083 "Gmsh.y"
 +=======
 +  case 244:
 +/* Line 1787 of yacc.c  */
 +#line 3220 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 257:
+ #line 3309 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (8)].d),
- 		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[-4].d),
+ 		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   NULL, (yyval.l));
      }
+ #line 8114 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 241:
 +#line 3090 "Gmsh.y"
 +=======
 +  case 245:
 +/* Line 1787 of yacc.c  */
 +#line 3227 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 258:
+ #line 3316 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (8)].d),
- 		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[-4].d),
+ 		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   NULL, (yyval.l));
      }
+ #line 8125 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 242:
 +#line 3097 "Gmsh.y"
 +=======
 +  case 246:
 +/* Line 1787 of yacc.c  */
 +#line 3234 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 259:
+ #line 3323 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (8)].d),
- 		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[-4].d),
+ 		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   NULL, (yyval.l));
      }
+ #line 8136 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 243:
 +#line 3104 "Gmsh.y"
 +=======
 +  case 247:
 +/* Line 1787 of yacc.c  */
 +#line 3241 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 260:
+ #line 3330 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
- 		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+       ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[-8].d),
+ 		   0., 0., 0., (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8147 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 244:
 +#line 3111 "Gmsh.y"
 +=======
 +  case 248:
 +/* Line 1787 of yacc.c  */
 +#line 3248 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 261:
+ #line 3337 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
- 		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+       ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-8].d),
+ 		   0., 0., 0., (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8158 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 245:
 +#line 3118 "Gmsh.y"
 +=======
 +  case 249:
 +/* Line 1787 of yacc.c  */
 +#line 3255 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 262:
+ #line 3344 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
- 		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+       ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-8].d),
+ 		   0., 0., 0., (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8169 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 246:
 +#line 3125 "Gmsh.y"
 +=======
 +  case 250:
 +/* Line 1787 of yacc.c  */
 +#line 3262 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 263:
+ #line 3351 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (14)].d),
- 		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[-10].d),
+ 		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8180 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 247:
 +#line 3132 "Gmsh.y"
 +=======
 +  case 251:
 +/* Line 1787 of yacc.c  */
 +#line 3269 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 264:
+ #line 3358 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (14)].d),
- 		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-10].d),
+ 		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8191 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 248:
 +#line 3139 "Gmsh.y"
 +=======
 +  case 252:
 +/* Line 1787 of yacc.c  */
 +#line 3276 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 265:
+ #line 3365 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (14)].d),
- 		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-10].d),
+ 		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-2].d),
  		   NULL, (yyval.l));
      }
+ #line 8202 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 249:
 +#line 3146 "Gmsh.y"
 +=======
 +  case 253:
 +/* Line 1787 of yacc.c  */
 +#line 3283 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 266:
+ #line 3372 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8212 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 250:
 +#line 3152 "Gmsh.y"
 +=======
 +  case 254:
 +/* Line 1787 of yacc.c  */
 +#line 3289 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 267:
+ #line 3378 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
- 		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[-8].d),
+ 		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   &extr, (yyval.l));
      }
+ #line 8223 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 251:
 +#line 3159 "Gmsh.y"
 +=======
 +  case 255:
 +/* Line 1787 of yacc.c  */
 +#line 3296 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 268:
+ #line 3385 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8233 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 252:
 +#line 3165 "Gmsh.y"
 +=======
 +  case 256:
 +/* Line 1787 of yacc.c  */
 +#line 3302 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 269:
+ #line 3391 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
- 		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[-8].d),
+ 		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   &extr, (yyval.l));
      }
+ #line 8244 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 253:
 +#line 3172 "Gmsh.y"
 +=======
 +  case 257:
 +/* Line 1787 of yacc.c  */
 +#line 3309 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 270:
+ #line 3398 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8254 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 254:
 +#line 3178 "Gmsh.y"
 +=======
 +  case 258:
 +/* Line 1787 of yacc.c  */
 +#line 3315 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 271:
+ #line 3404 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
- 		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+       ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[-8].d),
+ 		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
  		   &extr, (yyval.l));
      }
+ #line 8265 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 255:
 +#line 3185 "Gmsh.y"
 +=======
 +  case 259:
 +/* Line 1787 of yacc.c  */
 +#line 3322 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 272:
+ #line 3411 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8275 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 256:
 +#line 3191 "Gmsh.y"
 +=======
 +  case 260:
 +/* Line 1787 of yacc.c  */
 +#line 3328 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 273:
+ #line 3417 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (16)].d),
- 		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+       ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[-12].d),
+ 		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8286 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 257:
 +#line 3198 "Gmsh.y"
 +=======
 +  case 261:
 +/* Line 1787 of yacc.c  */
 +#line 3335 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 274:
+ #line 3424 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8296 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 258:
 +#line 3204 "Gmsh.y"
 +=======
 +  case 262:
 +/* Line 1787 of yacc.c  */
 +#line 3341 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 275:
+ #line 3430 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (16)].d),
- 		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+       ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-12].d),
+ 		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8307 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 259:
 +#line 3211 "Gmsh.y"
 +=======
 +  case 263:
 +/* Line 1787 of yacc.c  */
 +#line 3348 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 276:
+ #line 3437 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8317 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 260:
 +#line 3217 "Gmsh.y"
 +=======
 +  case 264:
 +/* Line 1787 of yacc.c  */
 +#line 3354 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 277:
+ #line 3443 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (16)].d),
- 		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+       ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-12].d),
+ 		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8328 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 261:
 +#line 3224 "Gmsh.y"
 +=======
 +  case 265:
 +/* Line 1787 of yacc.c  */
 +#line 3361 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 278:
+ #line 3450 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8338 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 262:
 +#line 3230 "Gmsh.y"
 +=======
 +  case 266:
 +/* Line 1787 of yacc.c  */
 +#line 3367 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 279:
+ #line 3456 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (18)].d),
- 		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[-14].d),
+ 		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8349 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 263:
 +#line 3237 "Gmsh.y"
 +=======
 +  case 267:
 +/* Line 1787 of yacc.c  */
 +#line 3374 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 280:
+ #line 3463 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8359 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 264:
 +#line 3243 "Gmsh.y"
 +=======
 +  case 268:
 +/* Line 1787 of yacc.c  */
 +#line 3380 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 281:
+ #line 3469 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (18)].d),
- 		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-14].d),
+ 		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8370 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 265:
 +#line 3250 "Gmsh.y"
 +=======
 +  case 269:
 +/* Line 1787 of yacc.c  */
 +#line 3387 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 282:
+ #line 3476 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
        extr.mesh.QuadToTri = NO_QUADTRI;
        extr.mesh.ScaleLast = false;
      }
+ #line 8380 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 266:
 +#line 3256 "Gmsh.y"
 +=======
 +  case 270:
 +/* Line 1787 of yacc.c  */
 +#line 3393 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 283:
+ #line 3482 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(Shape));
-       ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (18)].d),
- 		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+       ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-14].d),
+ 		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
  		   &extr, (yyval.l));
      }
+ #line 8391 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 267:
 +#line 3267 "Gmsh.y"
 +=======
 +  case 271:
 +/* Line 1787 of yacc.c  */
 +#line 3404 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 284:
+ #line 3493 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
      }
+ #line 8398 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 268:
 +#line 3270 "Gmsh.y"
 +=======
 +  case 272:
 +/* Line 1787 of yacc.c  */
 +#line 3407 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 285:
+ #line 3496 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
      }
+ #line 8405 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 269:
 +#line 3276 "Gmsh.y"
 +=======
 +  case 273:
 +/* Line 1787 of yacc.c  */
 +#line 3413 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 286:
+ #line 3502 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int n = (int)fabs((yyvsp[(3) - (5)].d));
+       int n = (int)fabs((yyvsp[-2].d));
        if(n){ // we accept n==0 to easily disable layers
          extr.mesh.ExtrudeMesh = true;
          extr.mesh.NbLayer = 1;
@@@ -12915,45 -8417,35 +16139,57 @@@
          extr.mesh.hLayer.push_back(1.);
        }
      }
+ #line 8421 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 270:
 +#line 3288 "Gmsh.y"
 +=======
 +  case 274:
 +/* Line 1787 of yacc.c  */
 +#line 3425 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 287:
+ #line 3514 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ExtrudeMesh = true;
-       extr.mesh.NbLayer = List_Nbr((yyvsp[(3) - (7)].l));
-       if(List_Nbr((yyvsp[(3) - (7)].l)) == List_Nbr((yyvsp[(5) - (7)].l))){
+       extr.mesh.NbLayer = List_Nbr((yyvsp[-4].l));
+       if(List_Nbr((yyvsp[-4].l)) == List_Nbr((yyvsp[-2].l))){
  	extr.mesh.NbElmLayer.clear();
  	extr.mesh.hLayer.clear();
- 	for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+ 	for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
  	  double d;
- 	  List_Read((yyvsp[(3) - (7)].l), i, &d);
+ 	  List_Read((yyvsp[-4].l), i, &d);
  	  extr.mesh.NbElmLayer.push_back((d > 0) ? (int)d : 1);
- 	  List_Read((yyvsp[(5) - (7)].l), i, &d);
+ 	  List_Read((yyvsp[-2].l), i, &d);
  	  extr.mesh.hLayer.push_back(d);
  	}
        }
        else
- 	yymsg(0, "Wrong layer definition {%d, %d}", List_Nbr((yyvsp[(3) - (7)].l)), List_Nbr((yyvsp[(5) - (7)].l)));
-       List_Delete((yyvsp[(3) - (7)].l));
-       List_Delete((yyvsp[(5) - (7)].l));
+ 	yymsg(0, "Wrong layer definition {%d, %d}", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-2].l)));
+       List_Delete((yyvsp[-4].l));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 8445 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 271:
 +#line 3308 "Gmsh.y"
 +=======
 +  case 275:
 +/* Line 1787 of yacc.c  */
 +#line 3445 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 288:
+ #line 3534 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "Explicit region numbers in layers are deprecated");
        extr.mesh.ExtrudeMesh = true;
@@@ -12970,164 -8462,103 +16206,230 @@@
  	}
        }
        else
- 	yymsg(0, "Wrong layer definition {%d, %d, %d}", List_Nbr((yyvsp[(3) - (9)].l)),
- 	      List_Nbr((yyvsp[(5) - (9)].l)), List_Nbr((yyvsp[(7) - (9)].l)));
-       List_Delete((yyvsp[(3) - (9)].l));
-       List_Delete((yyvsp[(5) - (9)].l));
-       List_Delete((yyvsp[(7) - (9)].l));
+ 	yymsg(0, "Wrong layer definition {%d, %d, %d}", List_Nbr((yyvsp[-6].l)),
+ 	      List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-2].l)));
+       List_Delete((yyvsp[-6].l));
+       List_Delete((yyvsp[-4].l));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 8472 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 272:
 +#line 3332 "Gmsh.y"
 +=======
 +  case 276:
 +/* Line 1787 of yacc.c  */
 +#line 3469 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 289:
+ #line 3558 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.ScaleLast = true;
      }
+ #line 8480 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 273:
 +#line 3336 "Gmsh.y"
 +=======
 +  case 277:
 +/* Line 1787 of yacc.c  */
 +#line 3473 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 290:
+ #line 3562 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.Recombine = true;
      }
+ #line 8488 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 274:
 +#line 3340 "Gmsh.y"
 +=======
 +  case 278:
 +/* Line 1787 of yacc.c  */
 +#line 3477 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 291:
+ #line 3566 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "Keyword 'QuadTriSngl' deprecated. Use 'QuadTriNoNewVerts' instead.");
      }
+ #line 8496 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 275:
 +#line 3344 "Gmsh.y"
 +=======
 +  case 279:
 +/* Line 1787 of yacc.c  */
 +#line 3481 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 292:
+ #line 3570 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "Keyword 'QuadTriSngl' deprecated. Use 'QuadTriNoNewVerts' instead.");
      }
+ #line 8504 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 276:
 +#line 3348 "Gmsh.y"
 +=======
 +  case 280:
 +/* Line 1787 of yacc.c  */
 +#line 3485 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 293:
+ #line 3574 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
              "which has no requirement for the number of extrusion layers and meshes "
              "with body-centered vertices.");
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 277:
 +#line 3354 "Gmsh.y"
 +=======
      }
+ #line 8514 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 281:
 +/* Line 1787 of yacc.c  */
 +#line 3491 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 294:
+ #line 3580 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
              "which has no requirement for the number of extrusion layers and meshes "
              "with body-centered vertices.");
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 278:
 +#line 3360 "Gmsh.y"
 +=======
      }
+ #line 8524 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 282:
 +/* Line 1787 of yacc.c  */
 +#line 3497 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 295:
+ #line 3586 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.QuadToTri = QUADTRI_ADDVERTS_1;
      }
+ #line 8532 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 279:
 +#line 3364 "Gmsh.y"
 +=======
 +  case 283:
 +/* Line 1787 of yacc.c  */
 +#line 3501 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 296:
+ #line 3590 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.QuadToTri = QUADTRI_ADDVERTS_1_RECOMB;
      }
+ #line 8540 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 280:
 +#line 3368 "Gmsh.y"
 +=======
 +  case 284:
 +/* Line 1787 of yacc.c  */
 +#line 3505 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 297:
+ #line 3594 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.QuadToTri = QUADTRI_NOVERTS_1;
      }
+ #line 8548 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 281:
 +#line 3372 "Gmsh.y"
 +=======
 +  case 285:
 +/* Line 1787 of yacc.c  */
 +#line 3509 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 298:
+ #line 3598 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        extr.mesh.QuadToTri = QUADTRI_NOVERTS_1_RECOMB;
      }
+ #line 8556 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 282:
 +#line 3376 "Gmsh.y"
 +=======
 +  case 286:
 +/* Line 1787 of yacc.c  */
 +#line 3513 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 299:
+ #line 3602 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int num = (int)(yyvsp[(3) - (9)].d);
+       int num = (int)(yyvsp[-6].d);
        if(FindSurface(num)){
  	yymsg(0, "Surface %d already exists", num);
        }
@@@ -13142,178 -8573,128 +16444,244 @@@
  	  extr.mesh.Holes[num].second.push_back((int)d);
  	}
        }
-       List_Delete((yyvsp[(6) - (9)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 8579 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 283:
 +#line 3395 "Gmsh.y"
 +=======
 +  case 287:
 +/* Line 1787 of yacc.c  */
 +#line 3532 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 300:
+ #line 3621 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(2) - (6)].c), "Index"))
-         extr.mesh.BoundaryLayerIndex = (yyvsp[(4) - (6)].d);
-       else if(!strcmp((yyvsp[(2) - (6)].c), "View"))
-         extr.mesh.ViewIndex = (yyvsp[(4) - (6)].d);
-       Free((yyvsp[(2) - (6)].c));
+       if(!strcmp((yyvsp[-4].c), "Index"))
+         extr.mesh.BoundaryLayerIndex = (yyvsp[-2].d);
+       else if(!strcmp((yyvsp[-4].c), "View"))
+         extr.mesh.ViewIndex = (yyvsp[-2].d);
+       Free((yyvsp[-4].c));
      }
+ #line 8591 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 284:
 +#line 3407 "Gmsh.y"
 +=======
 +  case 288:
 +/* Line 1787 of yacc.c  */
 +#line 3544 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 301:
+ #line 3633 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.v)[0] = (yyval.v)[1] = 1.;
      }
+ #line 8599 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 285:
 +#line 3411 "Gmsh.y"
 +=======
 +  case 289:
 +/* Line 1787 of yacc.c  */
 +#line 3548 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 302:
+ #line 3637 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(2) - (3)].c), "Progression") || !strcmp((yyvsp[(2) - (3)].c), "Power"))
+       if(!strcmp((yyvsp[-1].c), "Progression") || !strcmp((yyvsp[-1].c), "Power"))
          (yyval.v)[0] = 1.;
-       else if(!strcmp((yyvsp[(2) - (3)].c), "Bump"))
+       else if(!strcmp((yyvsp[-1].c), "Bump"))
          (yyval.v)[0] = 2.;
        else{
          yymsg(0, "Unknown transfinite mesh type");
          (yyval.v)[0] = 1.;
        }
-       (yyval.v)[1] = (yyvsp[(3) - (3)].d);
-       Free((yyvsp[(2) - (3)].c));
+       (yyval.v)[1] = (yyvsp[0].d);
+       Free((yyvsp[-1].c));
      }
+ #line 8616 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 286:
 +#line 3426 "Gmsh.y"
 +=======
 +  case 290:
 +/* Line 1787 of yacc.c  */
 +#line 3563 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 303:
+ #line 3652 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.i) = -1; // left
      }
+ #line 8624 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 287:
 +#line 3430 "Gmsh.y"
 +=======
 +  case 291:
 +/* Line 1787 of yacc.c  */
 +#line 3567 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 304:
+ #line 3656 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(1) - (1)].c), "Right"))
+       if(!strcmp((yyvsp[0].c), "Right"))
          (yyval.i) = 1;
-       else if(!strcmp((yyvsp[(1) - (1)].c), "Left"))
+       else if(!strcmp((yyvsp[0].c), "Left"))
  	(yyval.i) = -1;
-       else if(!strcmp((yyvsp[(1) - (1)].c), "AlternateRight"))
+       else if(!strcmp((yyvsp[0].c), "AlternateRight"))
  	(yyval.i) = 2;
-       else if(!strcmp((yyvsp[(1) - (1)].c), "AlternateLeft"))
+       else if(!strcmp((yyvsp[0].c), "AlternateLeft"))
  	(yyval.i) = -2;
        else // "Alternate" -> "Alternate Right"
  	(yyval.i) = 2;
-       Free((yyvsp[(1) - (1)].c));
+       Free((yyvsp[0].c));
      }
+ #line 8642 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 288:
 +#line 3446 "Gmsh.y"
 +=======
 +  case 292:
 +/* Line 1787 of yacc.c  */
 +#line 3583 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 305:
+ #line 3672 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
       (yyval.l) = List_Create(1, 1, sizeof(double));
     }
+ #line 8650 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 289:
 +#line 3450 "Gmsh.y"
 +=======
 +  case 293:
 +/* Line 1787 of yacc.c  */
 +#line 3587 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 306:
+ #line 3676 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-      (yyval.l) = (yyvsp[(2) - (2)].l);
+      (yyval.l) = (yyvsp[0].l);
     }
+ #line 8658 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 290:
 +#line 3455 "Gmsh.y"
 +=======
 +  case 294:
 +/* Line 1787 of yacc.c  */
 +#line 3592 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 307:
+ #line 3681 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.i) = 45;
      }
+ #line 8666 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 291:
 +#line 3459 "Gmsh.y"
 +=======
 +  case 295:
 +/* Line 1787 of yacc.c  */
 +#line 3596 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 308:
+ #line 3685 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.i) = (int)(yyvsp[(2) - (2)].d);
+       (yyval.i) = (int)(yyvsp[0].d);
      }
+ #line 8674 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 292:
 +#line 3466 "Gmsh.y"
 +=======
 +  case 296:
 +/* Line 1787 of yacc.c  */
 +#line 3602 "Gmsh.y"
++=======
+   case 309:
+ #line 3691 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(1, 1, sizeof(double));
      }
+ #line 8682 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 297:
- /* Line 1787 of yacc.c  */
- #line 3606 "Gmsh.y"
+   case 310:
+ #line 3695 "Gmsh.y" /* yacc.c:1646  */
      {
-       (yyval.l) = (yyvsp[(2) - (2)].l);
+       (yyval.l) = (yyvsp[0].l);
      }
+ #line 8690 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 298:
 +/* Line 1787 of yacc.c  */
 +#line 3613 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 311:
+ #line 3702 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int type = (int)(yyvsp[(6) - (7)].v)[0];
-       double coef = fabs((yyvsp[(6) - (7)].v)[1]);
-       if(!(yyvsp[(3) - (7)].l)){
+       int type = (int)(yyvsp[-1].v)[0];
+       double coef = fabs((yyvsp[-1].v)[1]);
+       if(!(yyvsp[-4].l)){
          List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Curves);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -13362,21 -8743,16 +16730,27 @@@
              }
            }
          }
-         List_Delete((yyvsp[(3) - (7)].l));
+         List_Delete((yyvsp[-4].l));
        }
      }
+ #line 8750 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 293:
 +#line 3522 "Gmsh.y"
 +=======
 +  case 299:
 +/* Line 1787 of yacc.c  */
 +#line 3669 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 312:
+ #line 3758 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int k = List_Nbr((yyvsp[(4) - (6)].l));
+       int k = List_Nbr((yyvsp[-2].l));
        if(k != 0 && k != 3 && k != 4){
          yymsg(0, "Wrong definition of Transfinite Surface: 0, 3 or 4 points needed");
        }
@@@ -13439,37 -8815,27 +16813,49 @@@
                  yymsg(0, "Unknown surface %d", (int)d);
              }
            }
-           List_Delete((yyvsp[(3) - (6)].l));
+           List_Delete((yyvsp[-3].l));
          }
        }
-       List_Delete((yyvsp[(4) - (6)].l));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 8824 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 294:
 +#line 3592 "Gmsh.y"
 +=======
 +  case 300:
 +/* Line 1787 of yacc.c  */
 +#line 3739 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 313:
+ #line 3828 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        yymsg(1, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
-       List_Delete((yyvsp[(7) - (8)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 8833 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 295:
 +#line 3597 "Gmsh.y"
 +=======
 +  case 301:
 +/* Line 1787 of yacc.c  */
 +#line 3744 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 314:
+ #line 3833 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int k = List_Nbr((yyvsp[(4) - (5)].l));
+       int k = List_Nbr((yyvsp[-1].l));
        if(k != 0 && k != 6 && k != 8){
          yymsg(0, "Wrong definition of Transfinite Volume: "
                "%d points instead of 6 or 8", k);
@@@ -13529,23 -8895,18 +16915,29 @@@
                  yymsg(0, "Unknown volume %d", (int)d);
              }
            }
-           List_Delete((yyvsp[(3) - (5)].l));
+           List_Delete((yyvsp[-2].l));
          }
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 8904 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 296:
 +#line 3664 "Gmsh.y"
 +=======
 +  case 302:
 +/* Line 1787 of yacc.c  */
 +#line 3811 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 315:
+ #line 3900 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(2) - (3)].l)){
+       if(!(yyvsp[-1].l)){
    	  List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -13576,38 -8937,28 +16968,50 @@@
                yymsg(1, "Unknown volume %d", (int)d);
            }
          }
-         List_Delete((yyvsp[(2) - (3)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 8944 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 297:
 +#line 3700 "Gmsh.y"
 +=======
 +  case 303:
 +/* Line 1787 of yacc.c  */
 +#line 3847 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 316:
+ #line 3936 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (7)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
  	double d;
- 	List_Read((yyvsp[(4) - (7)].l), i, &d);
- 	CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)(yyvsp[(6) - (7)].d);
+ 	List_Read((yyvsp[-3].l), i, &d);
+ 	CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)(yyvsp[-1].d);
        }
      }
+ #line 8956 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 298:
 +#line 3708 "Gmsh.y"
 +=======
 +  case 304:
 +/* Line 1787 of yacc.c  */
 +#line 3855 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 317:
+ #line 3944 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (5)].l)){
+       if(!(yyvsp[-2].l)){
  	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -13645,21 -8996,16 +17049,27 @@@
                yymsg(1, "Unknown surface %d", (int)d);
            }
          }
-         List_Delete((yyvsp[(3) - (5)].l));
+         List_Delete((yyvsp[-2].l));
        }
      }
+ #line 9003 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 299:
 +#line 3751 "Gmsh.y"
 +=======
 +  case 305:
 +/* Line 1787 of yacc.c  */
 +#line 3898 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 318:
+ #line 3987 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
  	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -13693,189 -9039,287 +17103,342 @@@
                yymsg(1, "Unknown volume %d", (int)d);
            }
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9046 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 300:
 +#line 3790 "Gmsh.y"
 +=======
 +  case 306:
 +/* Line 1787 of yacc.c  */
 +#line 3937 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 319:
+ #line 4026 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
- 	double d;
- 	List_Read((yyvsp[(3) - (6)].l), i, &d);
- 	int j = (int)d;
- 	Surface *s = FindSurface(j);
- 	if(s){
-           s->TransfiniteSmoothing = (int)(yyvsp[(5) - (6)].d);
+       for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
+         double d;
+         List_Read((yyvsp[-3].l), i, &d);
+         int j = (int)d;
+         Surface *s = FindSurface(j);
+         if(s){
+           s->TransfiniteSmoothing = (int)(yyvsp[-1].d);
          }
          else{
- 	  GFace *gf = GModel::current()->getFaceByTag(j);
- 	  if(gf)
-             gf->meshAttributes.transfiniteSmoothing = (int)(yyvsp[(5) - (6)].d);
+           GFace *gf = GModel::current()->getFaceByTag(j);
+           if(gf)
+             gf->meshAttributes.transfiniteSmoothing = (int)(yyvsp[-1].d);
            else
- 	    yymsg(1, "Unknown surface %d", (int)(yyvsp[(5) - (6)].d));
+             yymsg(1, "Unknown surface %d", (int)(yyvsp[-1].d));
          }
        }
-       List_Delete((yyvsp[(3) - (6)].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 9070 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 301:
 +#line 3810 "Gmsh.y"
 +=======
 +  case 307:
 +/* Line 1787 of yacc.c  */
 +#line 3957 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 320:
+ #line 4047 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(List_Nbr((yyvsp[(5) - (6)].l)) != List_Nbr((yyvsp[(3) - (6)].l))){
- 	yymsg(0, "Number of master (%d) different from number of slave (%d) lines",
-               List_Nbr((yyvsp[(5) - (6)].l)), List_Nbr((yyvsp[(3) - (6)].l)));
+       if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-3].l))){
+         yymsg(0, "Number of master lines (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-7].l)));
        }
        else{
-         for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+         std::vector<double> transfo;
+         if(List_Nbr((yyvsp[-1].l)) != 0) {
+           if (List_Nbr((yyvsp[-1].l)) < 12){
+             yymsg(0, "Affine transformation requires at least 12 entries (we have %d)",
+                   List_Nbr((yyvsp[-1].l)));
+           }
+           else {
+             transfo.resize(List_Nbr((yyvsp[-1].l)));
+             for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+               List_Read((yyvsp[-1].l), i, &transfo[i]);
+           }
+         }
+         for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
            double d_master, d_slave;
-           List_Read((yyvsp[(5) - (6)].l), i, &d_master);
-           List_Read((yyvsp[(3) - (6)].l), i, &d_slave);
+           List_Read((yyvsp[-3].l), i, &d_master);
+           List_Read((yyvsp[-7].l), i, &d_slave);
            int j_master = (int)d_master;
            int j_slave  = (int)d_slave;
-           Curve *c_slave = FindCurve(abs(j_slave));
-           if(c_slave){
- 	    GModel::current()->getGEOInternals()->periodicEdges[j_slave] = j_master;
-           }
-           else{
-             GEdge *ge = GModel::current()->getEdgeByTag(abs(j_slave));
-             if(ge) ge->setMeshMaster(j_master);
-             else yymsg(0, "Unknown line %d", j_slave);
-           }
+           addPeriodicEdge(j_slave, j_master, transfo);
          }
        }
-       List_Delete((yyvsp[(3) - (6)].l));
-       List_Delete((yyvsp[(5) - (6)].l));
+       List_Delete((yyvsp[-7].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 9105 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 302:
 +#line 3838 "Gmsh.y"
 +=======
 +  case 308:
 +/* Line 1787 of yacc.c  */
 +#line 3985 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 321:
+ #line 4079 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if (List_Nbr((yyvsp[(5) - (13)].l)) != List_Nbr((yyvsp[(10) - (13)].l))){
- 	yymsg(0, "Number of master surface edges (%d) different from number of "
-               "slave (%d) edges", List_Nbr((yyvsp[(10) - (13)].l)), List_Nbr((yyvsp[(5) - (13)].l)));
+       if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-3].l))){
+         yymsg(0, "Number of master faces (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-7].l)));
        }
        else{
-         int j_master = (int)(yyvsp[(8) - (13)].d);
-         int j_slave = (int)(yyvsp[(3) - (13)].d);
-         Surface *s_slave = FindSurface(abs(j_slave));
- 	std::vector<double> transfo;
- 	for(int i = 0; i < List_Nbr((yyvsp[(12) - (13)].l)); i++){
- 	  double d;
- 	  List_Read((yyvsp[(12) - (13)].l), i, &d);
- 	  transfo.push_back(d);
- 	}
-         if(s_slave){
- 	  GModel::current()->getGEOInternals()->periodicFaces[j_slave] = j_master;
-           for (int i = 0; i < List_Nbr((yyvsp[(5) - (13)].l)); i++){
-             double dm, ds;
-             List_Read((yyvsp[(5) - (13)].l), i, &ds);
-             List_Read((yyvsp[(10) - (13)].l), i, &dm);
- 	    GModel::current()->getGEOInternals()->periodicEdges[(int)ds] = (int)dm;
-             s_slave->edgeCounterparts[(int)ds] = (int)dm;
-             s_slave->affineTransform = transfo;
-           }
+         if (List_Nbr((yyvsp[-1].l)) < 12){
+           // FIXME full automatic case here if List_Nbr($10) == 0)
+           yymsg(0, "Affine transformation requires at least 12 entries");
          }
-         else{
-           GFace *gf = GModel::current()->getFaceByTag(abs(j_slave));
-           if(gf){
-             gf->setMeshMaster(j_master);
-             for (int i = 0; i < List_Nbr((yyvsp[(5) - (13)].l)); i++){
-               double dm, ds;
-               List_Read((yyvsp[(5) - (13)].l), i, &ds);
-               List_Read((yyvsp[(10) - (13)].l), i, &dm);
-               gf->edgeCounterparts[(int)ds] = (int)dm;
- 	      gf->affineTransform = transfo;
- 	      GEdge *ges = GModel::current()->getEdgeByTag(abs((int)ds));
- 	      ges->setMeshMaster((int)dm);
-             }
+         else {
+           std::vector<double> transfo(16,0);
+           for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+             List_Read((yyvsp[-1].l), i, &transfo[i]);
+           for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
+             double d_master, d_slave;
+             List_Read((yyvsp[-3].l), i, &d_master);
+             List_Read((yyvsp[-7].l), i, &d_slave);
+             addPeriodicFace(d_slave,d_master,transfo);
            }
-           else yymsg(0, "Unknown surface %d", j_slave);
          }
        }
-       List_Delete((yyvsp[(5) - (13)].l));
-       List_Delete((yyvsp[(10) - (13)].l));
-       List_Delete((yyvsp[(12) - (13)].l));
+       List_Delete((yyvsp[-7].l));
+       List_Delete((yyvsp[-3].l));
      }
+ #line 9135 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 303:
 +#line 3877 "Gmsh.y"
 +=======
 +  case 309:
 +/* Line 1787 of yacc.c  */
 +#line 4033 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 322:
+ #line 4106 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
-       if(s){
- 	setSurfaceEmbeddedPoints(s, (yyvsp[(3) - (10)].l));
+       if (List_Nbr((yyvsp[-14].l)) != List_Nbr((yyvsp[-10].l))){
+         yymsg(0, "Number of master edges (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-10].l)), List_Nbr((yyvsp[-14].l)));
        }
        else{
-         GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[(8) - (10)].d));
-         if(gf){
-           for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
-             double d;
-             List_Read((yyvsp[(3) - (10)].l), i, &d);
-             int iPoint = (int)d;
-             GVertex *gv = GModel::current()->getVertexByTag(iPoint);
-             if(!gv){ // sync model in case the embedded point is a .geo point
-               GModel::current()->importGEOInternals();
-               gv = GModel::current()->getVertexByTag(iPoint);
-             }
-             if(gv)
-               gf->addEmbeddedVertex(gv);
-             else
-               yymsg(0, "Unknown point %d", iPoint);
-           }
+         SPoint3 axis((yyvsp[-6].v)[0],(yyvsp[-6].v)[1],(yyvsp[-6].v)[2]);
+         SPoint3 origin((yyvsp[-4].v)[0],(yyvsp[-4].v)[1],(yyvsp[-4].v)[2]);
+         double  angle((yyvsp[-2].d));
+         SPoint3 translation(0,0,0);
+ 
+         std::vector<double> transfo;
+         computeAffineTransformation(origin,axis,angle,translation,transfo);
+ 
+         for(int i = 0; i < List_Nbr((yyvsp[-14].l)); i++){
+           double d_master, d_slave;
+           List_Read((yyvsp[-10].l), i, &d_master);
+           List_Read((yyvsp[-14].l), i, &d_slave);
+           addPeriodicEdge(d_slave,d_master,transfo);
          }
-         else
-           yymsg(0, "Unknown surface %d", (int)(yyvsp[(8) - (10)].d));
        }
+       List_Delete((yyvsp[-14].l));
+       List_Delete((yyvsp[-10].l));
      }
+ #line 9164 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
- <<<<<<< HEAD
-   case 304:
- #line 3900 "Gmsh.y"
- =======
-   case 310:
- /* Line 1787 of yacc.c  */
- #line 4061 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
+   case 323:
+ #line 4132 "Gmsh.y" /* yacc.c:1646  */
      {
-       Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
-       if(s){
- 	setSurfaceEmbeddedCurves(s, (yyvsp[(3) - (10)].l));
+       if (List_Nbr((yyvsp[-14].l)) != List_Nbr((yyvsp[-10].l))){
+         yymsg(0, "Number of master faces (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-10].l)), List_Nbr((yyvsp[-14].l)));
        }
        else{
-         GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[(8) - (10)].d));
-         if(gf){
-           for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
-             double d;
-             List_Read((yyvsp[(3) - (10)].l), i, &d);
+         SPoint3 origin((yyvsp[-4].v)[0],(yyvsp[-4].v)[1],(yyvsp[-4].v)[2]);
+         SPoint3 axis((yyvsp[-6].v)[0],(yyvsp[-6].v)[1],(yyvsp[-6].v)[2]);
+         double  angle((yyvsp[-2].d));
+         SPoint3 translation(0,0,0);
+ 
+         std::vector<double> transfo;
+         computeAffineTransformation(origin,axis,angle,translation,transfo);
+ 
+         for(int i = 0; i < List_Nbr((yyvsp[-14].l)); i++){
+           double d_master, d_slave;
+           List_Read((yyvsp[-10].l), i, &d_master);
+           List_Read((yyvsp[-14].l), i, &d_slave);
+           addPeriodicFace(d_slave,d_master,transfo);
+         }
+       }
+       List_Delete((yyvsp[-14].l));
+       List_Delete((yyvsp[-10].l));
+     }
+ #line 9193 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 324:
+ #line 4158 "Gmsh.y" /* yacc.c:1646  */
+     {
+       if (List_Nbr((yyvsp[-8].l)) != List_Nbr((yyvsp[-4].l))){
+         yymsg(0, "Number of master edges (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-8].l)));
+       }
+       else{
+         SPoint3 origin(0,0,0);
+         SPoint3 axis(0,0,0);
+         double  angle(0);
+         SPoint3 translation((yyvsp[-1].v)[0],(yyvsp[-1].v)[1],(yyvsp[-1].v)[2]);
+ 
+         std::vector<double> transfo;
+         computeAffineTransformation(origin,axis,angle,translation,transfo);
+ 
+         for(int i = 0; i < List_Nbr((yyvsp[-8].l)); i++){
+           double d_master, d_slave;
+           List_Read((yyvsp[-4].l), i, &d_master);
+           List_Read((yyvsp[-8].l), i, &d_slave);
+           addPeriodicEdge(d_slave,d_master,transfo);
+         }
+       }
+       List_Delete((yyvsp[-8].l));
+       List_Delete((yyvsp[-4].l));
+     }
+ #line 9222 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 325:
+ #line 4184 "Gmsh.y" /* yacc.c:1646  */
+     {
+       if (List_Nbr((yyvsp[-8].l)) != List_Nbr((yyvsp[-4].l))){
+         yymsg(0, "Number of master faces (%d) different from number of "
+               "slaves (%d) ", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-8].l)));
+       }
+       else{
+         SPoint3 origin(0,0,0);
+         SPoint3 axis(0,0,0);
+         double  angle(0);
+         SPoint3 translation((yyvsp[-1].v)[0],(yyvsp[-1].v)[1],(yyvsp[-1].v)[2]);
+ 
+         std::vector<double> transfo;
+         computeAffineTransformation(origin,axis,angle,translation,transfo);
+ 
+         for(int i = 0; i < List_Nbr((yyvsp[-8].l)); i++){
+           double d_master, d_slave;
+           List_Read((yyvsp[-4].l), i, &d_master);
+           List_Read((yyvsp[-8].l), i, &d_slave);
+           addPeriodicFace(d_slave,d_master,transfo);
+         }
+       }
+       List_Delete((yyvsp[-8].l));
+       List_Delete((yyvsp[-4].l));
+     }
+ #line 9251 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 326:
+ #line 4210 "Gmsh.y" /* yacc.c:1646  */
+     {
+       if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-2].l))){
+         yymsg(0, "Number of master surface edges (%d) different from number of "
+               "slave (%d) edges", List_Nbr((yyvsp[-2].l)), List_Nbr((yyvsp[-7].l)));
+       }
+       else{
+         int j_master = (int)(yyvsp[-4].d);
+         int j_slave = (int)(yyvsp[-9].d);
+         std::map<int,int> edgeCounterParts;
+         for (int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
+           double ds,dm;
+           List_Read((yyvsp[-7].l),i,&ds);
+           List_Read((yyvsp[-2].l),i,&dm);
+           edgeCounterParts[(int) ds] = (int) dm;
+         }
+         addPeriodicFace(j_slave,j_master,edgeCounterParts);
+       }
+       List_Delete((yyvsp[-7].l));
+       List_Delete((yyvsp[-2].l));
+     }
+ #line 9276 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 327:
+ #line 4231 "Gmsh.y" /* yacc.c:1646  */
+     {
+       Surface *s = FindSurface((int)(yyvsp[-2].d));
+       if(s){
+ 	setSurfaceEmbeddedPoints(s, (yyvsp[-7].l));
+       }
+       else{
+         GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[-2].d));
+         if(gf){
+           for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
+             double d;
+             List_Read((yyvsp[-7].l), i, &d);
+             int iPoint = (int)d;
+             GVertex *gv = GModel::current()->getVertexByTag(iPoint);
+             if(!gv){ // sync model in case the embedded point is a .geo point
+               GModel::current()->importGEOInternals();
+               gv = GModel::current()->getVertexByTag(iPoint);
+             }
+             if(gv)
+               gf->addEmbeddedVertex(gv);
+             else
+               yymsg(0, "Unknown point %d", iPoint);
+           }
+         }
+         else
+           yymsg(0, "Unknown surface %d", (int)(yyvsp[-2].d));
+       }
+     }
+ #line 9308 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
++<<<<<<< HEAD
++<<<<<<< HEAD
++  case 304:
++#line 3900 "Gmsh.y"
++=======
++  case 310:
++/* Line 1787 of yacc.c  */
++#line 4061 "Gmsh.y"
++>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 328:
+ #line 4259 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
+     {
+       Surface *s = FindSurface((int)(yyvsp[-2].d));
+       if(s){
+ 	setSurfaceEmbeddedCurves(s, (yyvsp[-7].l));
+       }
+       else{
+         GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[-2].d));
+         if(gf){
+           for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
+             double d;
+             List_Read((yyvsp[-7].l), i, &d);
              int iCurve = (int)d;
              GEdge *ge = GModel::current()->getEdgeByTag(iCurve);
              if(!ge){ // sync model in case the embedded line is a .geo line
@@@ -13889,56 -9333,41 +17452,74 @@@
            }
          }
          else
-           yymsg(0, "Unknown surface %d", (int)(yyvsp[(8) - (10)].d));
+           yymsg(0, "Unknown surface %d", (int)(yyvsp[-2].d));
        }
      }
+ #line 9340 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 305:
 +#line 3923 "Gmsh.y"
 +=======
 +  case 311:
 +/* Line 1787 of yacc.c  */
 +#line 4089 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 329:
+ #line 4287 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        Msg::Error("Point in Volume not implemented yet");
      }
+ #line 9348 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 306:
 +#line 3927 "Gmsh.y"
 +=======
 +  case 312:
 +/* Line 1787 of yacc.c  */
 +#line 4093 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 330:
+ #line 4291 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        Msg::Error("Line in Volume not implemented yet");
      }
+ #line 9356 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 307:
 +#line 3931 "Gmsh.y"
 +=======
 +  case 313:
 +/* Line 1787 of yacc.c  */
 +#line 4097 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 331:
+ #line 4295 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       Volume *v = FindVolume((int)(yyvsp[(8) - (10)].d));
+       Volume *v = FindVolume((int)(yyvsp[-2].d));
        if(v){
- 	setVolumeEmbeddedSurfaces(v, (yyvsp[(3) - (10)].l));
+ 	setVolumeEmbeddedSurfaces(v, (yyvsp[-7].l));
        }
        else{
-         GRegion *gr = GModel::current()->getRegionByTag((int)(yyvsp[(8) - (10)].d));
+         GRegion *gr = GModel::current()->getRegionByTag((int)(yyvsp[-2].d));
          if(gr){
-           for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+           for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
              double d;
-             List_Read((yyvsp[(3) - (10)].l), i, &d);
+             List_Read((yyvsp[-7].l), i, &d);
              int iSurface = (int)d;
              GFace *gf = GModel::current()->getFaceByTag(iSurface);
              if(!gf){ // sync model in case the embedded face is a .geo face
@@@ -13952,21 -9381,16 +17533,27 @@@
            }
          }
          else
-           yymsg(0, "Unknown volume %d", (int)(yyvsp[(8) - (10)].d));
+           yymsg(0, "Unknown volume %d", (int)(yyvsp[-2].d));
        }
      }
+ #line 9388 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 308:
 +#line 3954 "Gmsh.y"
 +=======
 +  case 314:
 +/* Line 1787 of yacc.c  */
 +#line 4125 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 332:
+ #line 4323 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
  	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -14000,21 -9424,16 +17587,27 @@@
                yymsg(1, "Unknown surface %d", (int)d);
            }
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9431 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 309:
 +#line 3993 "Gmsh.y"
 +=======
 +  case 315:
 +/* Line 1787 of yacc.c  */
 +#line 4164 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 333:
+ #line 4362 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
  	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Curves);
          if(List_Nbr(tmp)){
            for(int i = 0; i < List_Nbr(tmp); i++){
@@@ -14048,21 -9467,16 +17641,27 @@@
                yymsg(1, "Unknown line %d", (int)d);
            }
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9474 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 310:
 +#line 4032 "Gmsh.y"
 +=======
 +  case 316:
 +/* Line 1787 of yacc.c  */
 +#line 4203 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 334:
+ #line 4401 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
          for(GModel::viter it = GModel::current()->firstVertex();
              it != GModel::current()->lastVertex(); it++)
            (*it)->relocateMeshVertices();
@@@ -14078,21 -9492,16 +17677,27 @@@
            else
              yymsg(1, "Unknown point %d", (int)d);
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9499 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 311:
 +#line 4053 "Gmsh.y"
 +=======
 +  case 317:
 +/* Line 1787 of yacc.c  */
 +#line 4224 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 335:
+ #line 4422 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
          for(GModel::eiter it = GModel::current()->firstEdge();
              it != GModel::current()->lastEdge(); it++)
            (*it)->relocateMeshVertices();
@@@ -14108,21 -9517,16 +17713,27 @@@
            else
              yymsg(1, "Unknown line %d", (int)d);
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9524 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 312:
 +#line 4074 "Gmsh.y"
 +=======
 +  case 318:
 +/* Line 1787 of yacc.c  */
 +#line 4245 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 336:
+ #line 4443 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!(yyvsp[(3) - (4)].l)){
+       if(!(yyvsp[-1].l)){
          for(GModel::fiter it = GModel::current()->firstFace();
              it != GModel::current()->lastFace(); it++)
            (*it)->relocateMeshVertices();
@@@ -14138,55 -9542,40 +17749,73 @@@
            else
              yymsg(1, "Unknown surface %d", (int)d);
          }
-         List_Delete((yyvsp[(3) - (4)].l));
+         List_Delete((yyvsp[-1].l));
        }
      }
+ #line 9549 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 313:
 +#line 4101 "Gmsh.y"
 +=======
 +  case 319:
 +/* Line 1787 of yacc.c  */
 +#line 4272 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 337:
+ #line 4470 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        ReplaceAllDuplicates();
      }
+ #line 9557 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 314:
 +#line 4105 "Gmsh.y"
 +=======
 +  case 320:
 +/* Line 1787 of yacc.c  */
 +#line 4276 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 338:
+ #line 4474 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(2) - (3)].c), "Geometry"))
+       if(!strcmp((yyvsp[-1].c), "Geometry"))
          ReplaceAllDuplicates();
-       else if(!strcmp((yyvsp[(2) - (3)].c), "Mesh"))
+       else if(!strcmp((yyvsp[-1].c), "Mesh"))
          GModel::current()->removeDuplicateMeshVertices(CTX::instance()->geom.tolerance);
        else
          yymsg(0, "Unknown coherence command");
-       Free((yyvsp[(2) - (3)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 9571 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 315:
 +#line 4115 "Gmsh.y"
 +=======
 +  case 321:
 +/* Line 1787 of yacc.c  */
 +#line 4286 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 339:
+ #line 4484 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(List_Nbr((yyvsp[(4) - (6)].l)) >= 2){
+       if(List_Nbr((yyvsp[-2].l)) >= 2){
          double d;
-         List_Read((yyvsp[(4) - (6)].l), 0, &d);
+         List_Read((yyvsp[-2].l), 0, &d);
          Vertex *target = FindPoint((int)d);
          if(!target)
            yymsg(0, "Could not find Point %d", (int)d);
@@@ -14210,756 -9599,451 +17839,821 @@@
        else
          yymsg(0, "Need at least two points to merge");
        ReplaceAllDuplicates();
-       List_Delete((yyvsp[(4) - (6)].l));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 9605 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 316:
 +#line 4149 "Gmsh.y"
 +    { (yyval.c) = (char*)"Homology"; ;}
 +    break;
 +
 +  case 317:
 +#line 4150 "Gmsh.y"
 +    { (yyval.c) = (char*)"Cohomology"; ;}
 +    break;
 +
 +  case 318:
 +#line 4151 "Gmsh.y"
 +    { (yyval.c) = (char*)"Betti"; ;}
 +    break;
 +
 +  case 319:
 +#line 4156 "Gmsh.y"
 +=======
 +  case 322:
 +/* Line 1787 of yacc.c  */
 +#line 4320 "Gmsh.y"
++=======
+   case 340:
+ #line 4518 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      { (yyval.c) = (char*)"Homology"; }
+ #line 9611 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 323:
- /* Line 1787 of yacc.c  */
- #line 4321 "Gmsh.y"
+   case 341:
+ #line 4519 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.c) = (char*)"Cohomology"; }
+ #line 9617 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 324:
- /* Line 1787 of yacc.c  */
- #line 4322 "Gmsh.y"
+   case 342:
+ #line 4520 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.c) = (char*)"Betti"; }
+ #line 9623 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 325:
 +/* Line 1787 of yacc.c  */
 +#line 4327 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 343:
+ #line 4525 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::vector<int> domain, subdomain, dim;
        for(int i = 0; i < 4; i++) dim.push_back(i);
-       GModel::current()->addHomologyRequest((yyvsp[(1) - (2)].c), domain, subdomain, dim);
+       GModel::current()->addHomologyRequest((yyvsp[-1].c), domain, subdomain, dim);
      }
+ #line 9633 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 320:
 +#line 4162 "Gmsh.y"
 +=======
 +  case 326:
 +/* Line 1787 of yacc.c  */
 +#line 4333 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 344:
+ #line 4531 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::vector<int> domain, subdomain, dim;
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
          double d;
-         List_Read((yyvsp[(3) - (5)].l), i, &d);
+         List_Read((yyvsp[-2].l), i, &d);
          domain.push_back((int)d);
        }
        for(int i = 0; i < 4; i++) dim.push_back(i);
-       GModel::current()->addHomologyRequest((yyvsp[(1) - (5)].c), domain, subdomain, dim);
-       List_Delete((yyvsp[(3) - (5)].l));
+       GModel::current()->addHomologyRequest((yyvsp[-4].c), domain, subdomain, dim);
+       List_Delete((yyvsp[-2].l));
      }
+ #line 9649 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 321:
 +#line 4174 "Gmsh.y"
 +=======
 +  case 327:
 +/* Line 1787 of yacc.c  */
 +#line 4345 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 345:
+ #line 4543 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::vector<int> domain, subdomain, dim;
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
          double d;
-         List_Read((yyvsp[(3) - (7)].l), i, &d);
+         List_Read((yyvsp[-4].l), i, &d);
          domain.push_back((int)d);
        }
-       for(int i = 0; i < List_Nbr((yyvsp[(5) - (7)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
          double d;
-         List_Read((yyvsp[(5) - (7)].l), i, &d);
+         List_Read((yyvsp[-2].l), i, &d);
          subdomain.push_back((int)d);
        }
        for(int i = 0; i < 4; i++) dim.push_back(i);
-       GModel::current()->addHomologyRequest((yyvsp[(1) - (7)].c), domain, subdomain, dim);
-       List_Delete((yyvsp[(3) - (7)].l));
-       List_Delete((yyvsp[(5) - (7)].l));
+       GModel::current()->addHomologyRequest((yyvsp[-6].c), domain, subdomain, dim);
+       List_Delete((yyvsp[-4].l));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 9671 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 322:
 +#line 4192 "Gmsh.y"
 +=======
 +  case 328:
 +/* Line 1787 of yacc.c  */
 +#line 4363 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 346:
+ #line 4561 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::vector<int> domain, subdomain, dim;
-       for(int i = 0; i < List_Nbr((yyvsp[(6) - (10)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
          double d;
-         List_Read((yyvsp[(6) - (10)].l), i, &d);
+         List_Read((yyvsp[-4].l), i, &d);
          domain.push_back((int)d);
        }
-       for(int i = 0; i < List_Nbr((yyvsp[(8) - (10)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
          double d;
-         List_Read((yyvsp[(8) - (10)].l), i, &d);
+         List_Read((yyvsp[-2].l), i, &d);
          subdomain.push_back((int)d);
        }
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
          double d;
-         List_Read((yyvsp[(3) - (10)].l), i, &d);
+         List_Read((yyvsp[-7].l), i, &d);
          dim.push_back((int)d);
        }
-       GModel::current()->addHomologyRequest((yyvsp[(1) - (10)].c), domain, subdomain, dim);
-       List_Delete((yyvsp[(6) - (10)].l));
-       List_Delete((yyvsp[(8) - (10)].l));
-       List_Delete((yyvsp[(3) - (10)].l));
+       GModel::current()->addHomologyRequest((yyvsp[-9].c), domain, subdomain, dim);
+       List_Delete((yyvsp[-4].l));
+       List_Delete((yyvsp[-2].l));
+       List_Delete((yyvsp[-7].l));
      }
+ #line 9698 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 323:
 +#line 4219 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (1)].d);           ;}
 +    break;
 +
 +  case 324:
 +#line 4220 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(2) - (3)].d);           ;}
 +    break;
 +
 +  case 325:
 +#line 4221 "Gmsh.y"
 +    { (yyval.d) = -(yyvsp[(2) - (2)].d);          ;}
 +    break;
 +
 +  case 326:
 +#line 4222 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(2) - (2)].d);           ;}
 +    break;
 +
 +  case 327:
 +#line 4223 "Gmsh.y"
 +    { (yyval.d) = !(yyvsp[(2) - (2)].d);          ;}
 +    break;
 +
 +  case 328:
 +#line 4224 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d);      ;}
 +    break;
 +
 +  case 329:
 +#line 4225 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d);      ;}
 +    break;
 +
 +  case 330:
 +#line 4226 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d);      ;}
 +    break;
 +
 +  case 331:
 +#line 4228 "Gmsh.y"
 +=======
 +  case 329:
 +/* Line 1787 of yacc.c  */
 +#line 4390 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (1)].d);           }
++=======
+   case 347:
+ #line 4588 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[0].d);           }
+ #line 9704 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      break;
  
-   case 330:
- /* Line 1787 of yacc.c  */
- #line 4391 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(2) - (3)].d);           }
+   case 348:
+ #line 4589 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-1].d);           }
+ #line 9710 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 331:
- /* Line 1787 of yacc.c  */
- #line 4392 "Gmsh.y"
-     { (yyval.d) = -(yyvsp[(2) - (2)].d);          }
+   case 349:
+ #line 4590 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = -(yyvsp[0].d);          }
+ #line 9716 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 332:
- /* Line 1787 of yacc.c  */
- #line 4393 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(2) - (2)].d);           }
 -  case 350:
 -#line 4591 "Gmsh.y" /* yacc.c:1646  */
 -    { (yyval.d) = (yyvsp[0].d);           }
 -#line 9722 "Gmsh.tab.cpp" /* yacc.c:1646  */
++  case 350:
++#line 4591 "Gmsh.y" /* yacc.c:1646  */
++    { (yyval.d) = (yyvsp[0].d);           }
++#line 9722 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 333:
- /* Line 1787 of yacc.c  */
- #line 4394 "Gmsh.y"
-     { (yyval.d) = !(yyvsp[(2) - (2)].d);          }
++  case 351:
++#line 4592 "Gmsh.y" /* yacc.c:1646  */
++    { (yyval.d) = !(yyvsp[0].d);          }
++#line 9728 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 334:
- /* Line 1787 of yacc.c  */
- #line 4395 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d);      }
++  case 352:
++#line 4593 "Gmsh.y" /* yacc.c:1646  */
++    { (yyval.d) = (yyvsp[-2].d) - (yyvsp[0].d);      }
++#line 9734 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 335:
- /* Line 1787 of yacc.c  */
- #line 4396 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d);      }
++  case 353:
++#line 4594 "Gmsh.y" /* yacc.c:1646  */
++    { (yyval.d) = (yyvsp[-2].d) + (yyvsp[0].d);      }
++#line 9740 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
-   case 336:
- /* Line 1787 of yacc.c  */
- #line 4397 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d);      }
++  case 354:
++#line 4595 "Gmsh.y" /* yacc.c:1646  */
++    { (yyval.d) = (yyvsp[-2].d) * (yyvsp[0].d);      }
++#line 9746 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
++<<<<<<< HEAD
 +  case 337:
 +/* Line 1787 of yacc.c  */
 +#line 4399 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
++  case 355:
++#line 4597 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
 +    {
-       if(!(yyvsp[(3) - (3)].d))
- 	yymsg(0, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
++      if(!(yyvsp[0].d))
++	yymsg(0, "Division by zero in '%g / %g'", (yyvsp[-2].d), (yyvsp[0].d));
 +      else
- 	(yyval.d) = (yyvsp[(1) - (3)].d) / (yyvsp[(3) - (3)].d);
++	(yyval.d) = (yyvsp[-2].d) / (yyvsp[0].d);
 +    }
++#line 9757 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +    break;
 +
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 332:
 +#line 4234 "Gmsh.y"
 +    { (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d);  ;}
 +    break;
 +
 +  case 333:
 +#line 4235 "Gmsh.y"
 +    { (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));  ;}
 +    break;
 +
 +  case 334:
 +#line 4236 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d);      ;}
 +    break;
 +
 +  case 335:
 +#line 4237 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d);      ;}
 +    break;
 +
 +  case 336:
 +#line 4238 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 337:
 +#line 4239 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 338:
 +#line 4240 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 339:
 +#line 4241 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 340:
 +#line 4242 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 341:
 +#line 4243 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d);     ;}
 +    break;
 +
 +  case 342:
 +#line 4244 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
 +    break;
 +
 +  case 343:
 +#line 4245 "Gmsh.y"
 +    { (yyval.d) = exp((yyvsp[(3) - (4)].d));      ;}
 +    break;
 +
 +  case 344:
 +#line 4246 "Gmsh.y"
 +    { (yyval.d) = log((yyvsp[(3) - (4)].d));      ;}
 +    break;
 +
 +  case 345:
 +#line 4247 "Gmsh.y"
 +    { (yyval.d) = log10((yyvsp[(3) - (4)].d));    ;}
 +    break;
 +
 +  case 346:
 +#line 4248 "Gmsh.y"
 +    { (yyval.d) = sqrt((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 347:
 +#line 4249 "Gmsh.y"
 +    { (yyval.d) = sin((yyvsp[(3) - (4)].d));      ;}
 +    break;
 +
 +  case 348:
 +#line 4250 "Gmsh.y"
 +    { (yyval.d) = asin((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 349:
 +#line 4251 "Gmsh.y"
 +    { (yyval.d) = cos((yyvsp[(3) - (4)].d));      ;}
 +    break;
 +
 +  case 350:
 +#line 4252 "Gmsh.y"
 +    { (yyval.d) = acos((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 351:
 +#line 4253 "Gmsh.y"
 +    { (yyval.d) = tan((yyvsp[(3) - (4)].d));      ;}
 +    break;
 +
 +  case 352:
 +#line 4254 "Gmsh.y"
 +    { (yyval.d) = atan((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 353:
 +#line 4255 "Gmsh.y"
 +    { (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
 +    break;
 +
 +  case 354:
 +#line 4256 "Gmsh.y"
 +    { (yyval.d) = sinh((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 355:
 +#line 4257 "Gmsh.y"
 +    { (yyval.d) = cosh((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 356:
 +#line 4258 "Gmsh.y"
 +    { (yyval.d) = tanh((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 357:
 +#line 4259 "Gmsh.y"
 +    { (yyval.d) = fabs((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 358:
 +#line 4260 "Gmsh.y"
 +    { (yyval.d) = floor((yyvsp[(3) - (4)].d));    ;}
 +    break;
 +
 +  case 359:
 +#line 4261 "Gmsh.y"
 +    { (yyval.d) = ceil((yyvsp[(3) - (4)].d));     ;}
 +    break;
 +
 +  case 360:
 +#line 4262 "Gmsh.y"
 +    { (yyval.d) = floor((yyvsp[(3) - (4)].d) + 0.5); ;}
 +    break;
 +
 +  case 361:
 +#line 4263 "Gmsh.y"
 +    { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
 +    break;
 +
 +  case 362:
 +#line 4264 "Gmsh.y"
 +    { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
 +    break;
 +
 +  case 363:
 +#line 4265 "Gmsh.y"
 +    { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
 +    break;
 +
 +  case 364:
 +#line 4266 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
 +    break;
 +
 +  case 365:
 +#line 4275 "Gmsh.y"
 +    { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
 +    break;
 +
 +  case 366:
 +#line 4276 "Gmsh.y"
 +    { (yyval.d) = 3.141592653589793; ;}
 +    break;
 +
 +  case 367:
 +#line 4277 "Gmsh.y"
 +    { (yyval.d) = Msg::GetCommRank(); ;}
 +    break;
 +
 +  case 368:
 +#line 4278 "Gmsh.y"
 +    { (yyval.d) = Msg::GetCommSize(); ;}
 +    break;
 +
 +  case 369:
 +#line 4279 "Gmsh.y"
 +    { (yyval.d) = GetGmshMajorVersion(); ;}
 +    break;
 +
 +  case 370:
 +#line 4280 "Gmsh.y"
 +    { (yyval.d) = GetGmshMinorVersion(); ;}
 +    break;
 +
 +  case 371:
 +#line 4281 "Gmsh.y"
 +    { (yyval.d) = GetGmshPatchVersion(); ;}
      break;
  
 -  case 351:
 -#line 4592 "Gmsh.y" /* yacc.c:1646  */
 -    { (yyval.d) = !(yyvsp[0].d);          }
 -#line 9728 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 372:
 +#line 4282 "Gmsh.y"
 +    { (yyval.d) = Cpu(); ;}
      break;
  
 -  case 352:
 -#line 4593 "Gmsh.y" /* yacc.c:1646  */
 -    { (yyval.d) = (yyvsp[-2].d) - (yyvsp[0].d);      }
 -#line 9734 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 373:
 +#line 4283 "Gmsh.y"
 +    { (yyval.d) = GetMemoryUsage()/1024./1024.; ;}
      break;
  
 -  case 353:
 -#line 4594 "Gmsh.y" /* yacc.c:1646  */
 -    { (yyval.d) = (yyvsp[-2].d) + (yyvsp[0].d);      }
 -#line 9740 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 374:
 +#line 4284 "Gmsh.y"
 +    { (yyval.d) = TotalRam(); ;}
      break;
  
 -  case 354:
 -#line 4595 "Gmsh.y" /* yacc.c:1646  */
 -    { (yyval.d) = (yyvsp[-2].d) * (yyvsp[0].d);      }
 -#line 9746 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +  case 375:
 +#line 4289 "Gmsh.y"
 +    { floatOptions.clear(); charOptions.clear(); ;}
      break;
  
 -  case 355:
 -#line 4597 "Gmsh.y" /* yacc.c:1646  */
 +  case 376:
 +#line 4291 "Gmsh.y"
      {
 -      if(!(yyvsp[0].d))
 -	yymsg(0, "Division by zero in '%g / %g'", (yyvsp[-2].d), (yyvsp[0].d));
 -      else
 -	(yyval.d) = (yyvsp[-2].d) / (yyvsp[0].d);
 -    }
 -#line 9757 "Gmsh.tab.cpp" /* yacc.c:1646  */
 +      std::vector<double> val(1, (yyvsp[(3) - (6)].d));
 +      Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
 +      (yyval.d) = val[0];
 +    ;}
      break;
  
 +  case 377:
 +#line 4297 "Gmsh.y"
 +=======
 +  case 338:
 +/* Line 1787 of yacc.c  */
 +#line 4405 "Gmsh.y"
 +    { (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d);  }
++=======
+   case 356:
+ #line 4603 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (int)(yyvsp[-2].d) % (int)(yyvsp[0].d);  }
+ #line 9763 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      break;
  
-   case 339:
- /* Line 1787 of yacc.c  */
- #line 4406 "Gmsh.y"
-     { (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));  }
+   case 357:
+ #line 4604 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = pow((yyvsp[-2].d), (yyvsp[0].d));  }
+ #line 9769 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 340:
- /* Line 1787 of yacc.c  */
- #line 4407 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d);      }
+   case 358:
+ #line 4605 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) < (yyvsp[0].d);      }
+ #line 9775 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 341:
- /* Line 1787 of yacc.c  */
- #line 4408 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d);      }
+   case 359:
+ #line 4606 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) > (yyvsp[0].d);      }
+ #line 9781 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 342:
- /* Line 1787 of yacc.c  */
- #line 4409 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d);     }
+   case 360:
+ #line 4607 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) <= (yyvsp[0].d);     }
+ #line 9787 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 343:
- /* Line 1787 of yacc.c  */
- #line 4410 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d);     }
+   case 361:
+ #line 4608 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) >= (yyvsp[0].d);     }
+ #line 9793 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 344:
- /* Line 1787 of yacc.c  */
- #line 4411 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d);     }
+   case 362:
+ #line 4609 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) == (yyvsp[0].d);     }
+ #line 9799 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 345:
- /* Line 1787 of yacc.c  */
- #line 4412 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d);     }
+   case 363:
+ #line 4610 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) != (yyvsp[0].d);     }
+ #line 9805 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 346:
- /* Line 1787 of yacc.c  */
- #line 4413 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d);     }
+   case 364:
+ #line 4611 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) && (yyvsp[0].d);     }
+ #line 9811 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 347:
- /* Line 1787 of yacc.c  */
- #line 4414 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d);     }
+   case 365:
+ #line 4612 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-2].d) || (yyvsp[0].d);     }
+ #line 9817 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 348:
- /* Line 1787 of yacc.c  */
- #line 4415 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); }
+   case 366:
+ #line 4613 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-4].d) ? (yyvsp[-2].d) : (yyvsp[0].d); }
+ #line 9823 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 349:
- /* Line 1787 of yacc.c  */
- #line 4416 "Gmsh.y"
-     { (yyval.d) = exp((yyvsp[(3) - (4)].d));      }
+   case 367:
+ #line 4614 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = exp((yyvsp[-1].d));      }
+ #line 9829 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 350:
- /* Line 1787 of yacc.c  */
- #line 4417 "Gmsh.y"
-     { (yyval.d) = log((yyvsp[(3) - (4)].d));      }
+   case 368:
+ #line 4615 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = log((yyvsp[-1].d));      }
+ #line 9835 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 351:
- /* Line 1787 of yacc.c  */
- #line 4418 "Gmsh.y"
-     { (yyval.d) = log10((yyvsp[(3) - (4)].d));    }
+   case 369:
+ #line 4616 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = log10((yyvsp[-1].d));    }
+ #line 9841 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 352:
- /* Line 1787 of yacc.c  */
- #line 4419 "Gmsh.y"
-     { (yyval.d) = sqrt((yyvsp[(3) - (4)].d));     }
+   case 370:
+ #line 4617 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = sqrt((yyvsp[-1].d));     }
+ #line 9847 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 353:
- /* Line 1787 of yacc.c  */
- #line 4420 "Gmsh.y"
-     { (yyval.d) = sin((yyvsp[(3) - (4)].d));      }
+   case 371:
+ #line 4618 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = sin((yyvsp[-1].d));      }
+ #line 9853 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 354:
- /* Line 1787 of yacc.c  */
- #line 4421 "Gmsh.y"
-     { (yyval.d) = asin((yyvsp[(3) - (4)].d));     }
+   case 372:
+ #line 4619 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = asin((yyvsp[-1].d));     }
+ #line 9859 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 355:
- /* Line 1787 of yacc.c  */
- #line 4422 "Gmsh.y"
-     { (yyval.d) = cos((yyvsp[(3) - (4)].d));      }
+   case 373:
+ #line 4620 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = cos((yyvsp[-1].d));      }
+ #line 9865 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 356:
- /* Line 1787 of yacc.c  */
- #line 4423 "Gmsh.y"
-     { (yyval.d) = acos((yyvsp[(3) - (4)].d));     }
+   case 374:
+ #line 4621 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = acos((yyvsp[-1].d));     }
+ #line 9871 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 357:
- /* Line 1787 of yacc.c  */
- #line 4424 "Gmsh.y"
-     { (yyval.d) = tan((yyvsp[(3) - (4)].d));      }
+   case 375:
+ #line 4622 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = tan((yyvsp[-1].d));      }
+ #line 9877 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 358:
- /* Line 1787 of yacc.c  */
- #line 4425 "Gmsh.y"
-     { (yyval.d) = atan((yyvsp[(3) - (4)].d));     }
+   case 376:
+ #line 4623 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = atan((yyvsp[-1].d));     }
+ #line 9883 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 359:
- /* Line 1787 of yacc.c  */
- #line 4426 "Gmsh.y"
-     { (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));}
+   case 377:
+ #line 4624 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = atan2((yyvsp[-3].d), (yyvsp[-1].d));}
+ #line 9889 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 360:
- /* Line 1787 of yacc.c  */
- #line 4427 "Gmsh.y"
-     { (yyval.d) = sinh((yyvsp[(3) - (4)].d));     }
+   case 378:
+ #line 4625 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = sinh((yyvsp[-1].d));     }
+ #line 9895 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 361:
- /* Line 1787 of yacc.c  */
- #line 4428 "Gmsh.y"
-     { (yyval.d) = cosh((yyvsp[(3) - (4)].d));     }
+   case 379:
+ #line 4626 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = cosh((yyvsp[-1].d));     }
+ #line 9901 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 362:
- /* Line 1787 of yacc.c  */
- #line 4429 "Gmsh.y"
-     { (yyval.d) = tanh((yyvsp[(3) - (4)].d));     }
+   case 380:
+ #line 4627 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = tanh((yyvsp[-1].d));     }
+ #line 9907 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 363:
- /* Line 1787 of yacc.c  */
- #line 4430 "Gmsh.y"
-     { (yyval.d) = fabs((yyvsp[(3) - (4)].d));     }
+   case 381:
+ #line 4628 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = fabs((yyvsp[-1].d));     }
+ #line 9913 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 364:
- /* Line 1787 of yacc.c  */
- #line 4431 "Gmsh.y"
-     { (yyval.d) = floor((yyvsp[(3) - (4)].d));    }
+   case 382:
+ #line 4629 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = floor((yyvsp[-1].d));    }
+ #line 9919 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 365:
- /* Line 1787 of yacc.c  */
- #line 4432 "Gmsh.y"
-     { (yyval.d) = ceil((yyvsp[(3) - (4)].d));     }
+   case 383:
+ #line 4630 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = ceil((yyvsp[-1].d));     }
+ #line 9925 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 366:
- /* Line 1787 of yacc.c  */
- #line 4433 "Gmsh.y"
-     { (yyval.d) = floor((yyvsp[(3) - (4)].d) + 0.5); }
+   case 384:
+ #line 4631 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = floor((yyvsp[-1].d) + 0.5); }
+ #line 9931 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 367:
- /* Line 1787 of yacc.c  */
- #line 4434 "Gmsh.y"
-     { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); }
+   case 385:
+ #line 4632 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = fmod((yyvsp[-3].d), (yyvsp[-1].d)); }
+ #line 9937 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 368:
- /* Line 1787 of yacc.c  */
- #line 4435 "Gmsh.y"
-     { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); }
+   case 386:
+ #line 4633 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = fmod((yyvsp[-3].d), (yyvsp[-1].d)); }
+ #line 9943 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 369:
- /* Line 1787 of yacc.c  */
- #line 4436 "Gmsh.y"
-     { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); }
+   case 387:
+ #line 4634 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = sqrt((yyvsp[-3].d) * (yyvsp[-3].d) + (yyvsp[-1].d) * (yyvsp[-1].d)); }
+ #line 9949 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 370:
- /* Line 1787 of yacc.c  */
- #line 4437 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; }
+   case 388:
+ #line 4635 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[-1].d) * (double)rand() / (double)RAND_MAX; }
+ #line 9955 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 371:
- /* Line 1787 of yacc.c  */
- #line 4446 "Gmsh.y"
-     { (yyval.d) = (yyvsp[(1) - (1)].d); }
+   case 389:
+ #line 4644 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.d) = (yyvsp[0].d); }
+ #line 9961 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 372:
- /* Line 1787 of yacc.c  */
- #line 4447 "Gmsh.y"
+   case 390:
+ #line 4645 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = 3.141592653589793; }
+ #line 9967 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 373:
- /* Line 1787 of yacc.c  */
- #line 4448 "Gmsh.y"
+   case 391:
+ #line 4646 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = Msg::GetCommRank(); }
+ #line 9973 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 374:
- /* Line 1787 of yacc.c  */
- #line 4449 "Gmsh.y"
+   case 392:
+ #line 4647 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = Msg::GetCommSize(); }
+ #line 9979 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 375:
- /* Line 1787 of yacc.c  */
- #line 4450 "Gmsh.y"
+   case 393:
+ #line 4648 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = GetGmshMajorVersion(); }
+ #line 9985 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 376:
- /* Line 1787 of yacc.c  */
- #line 4451 "Gmsh.y"
+   case 394:
+ #line 4649 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = GetGmshMinorVersion(); }
+ #line 9991 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 377:
- /* Line 1787 of yacc.c  */
- #line 4452 "Gmsh.y"
+   case 395:
+ #line 4650 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = GetGmshPatchVersion(); }
+ #line 9997 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 378:
- /* Line 1787 of yacc.c  */
- #line 4453 "Gmsh.y"
+   case 396:
+ #line 4651 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = Cpu(); }
+ #line 10003 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 379:
- /* Line 1787 of yacc.c  */
- #line 4454 "Gmsh.y"
+   case 397:
+ #line 4652 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = GetMemoryUsage()/1024./1024.; }
+ #line 10009 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 380:
- /* Line 1787 of yacc.c  */
- #line 4455 "Gmsh.y"
+   case 398:
+ #line 4653 "Gmsh.y" /* yacc.c:1646  */
      { (yyval.d) = TotalRam(); }
+ #line 10015 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 381:
- /* Line 1787 of yacc.c  */
- #line 4460 "Gmsh.y"
+   case 399:
+ #line 4658 "Gmsh.y" /* yacc.c:1646  */
      { floatOptions.clear(); charOptions.clear(); }
+ #line 10021 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 382:
- /* Line 1787 of yacc.c  */
- #line 4462 "Gmsh.y"
+   case 400:
+ #line 4660 "Gmsh.y" /* yacc.c:1646  */
      {
-       std::vector<double> val(1, (yyvsp[(3) - (6)].d));
+       std::vector<double> val(1, (yyvsp[-3].d));
        Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
        (yyval.d) = val[0];
      }
+ #line 10031 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 383:
 +/* Line 1787 of yacc.c  */
 +#line 4468 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 401:
+ #line 4666 "Gmsh.y" /* yacc.c:1646  */
      {
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (1)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (1)].c));
+       (yyval.d) = Msg::GetOnelabNumber((yyvsp[-1].c));
+       Free((yyvsp[-1].c));
+     }
+ #line 10040 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 402:
+ #line 4671 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
+     {
+       if(!gmsh_yysymbols.count((yyvsp[0].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[0].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -14971,22 -10055,17 +18665,28 @@@
          else
            (yyval.d) = s.value[0];
        }
-       Free((yyvsp[(1) - (1)].c));
+       Free((yyvsp[0].c));
      }
+ #line 10061 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 378:
 +#line 4314 "Gmsh.y"
 +=======
 +  case 384:
 +/* Line 1787 of yacc.c  */
 +#line 4485 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 403:
+ #line 4688 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int index = (int)(yyvsp[(3) - (4)].d);
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+       int index = (int)(yyvsp[-1].d);
+       if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -14998,22 -10077,17 +18698,28 @@@
          else
            (yyval.d) = s.value[index];
        }
-       Free((yyvsp[(1) - (4)].c));
+       Free((yyvsp[-3].c));
      }
+ #line 10083 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 379:
 +#line 4332 "Gmsh.y"
 +=======
 +  case 385:
 +/* Line 1787 of yacc.c  */
 +#line 4503 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 404:
+ #line 4706 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int index = (int)(yyvsp[(3) - (4)].d);
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+       int index = (int)(yyvsp[-1].d);
+       if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -15025,80 -10099,139 +18731,194 @@@
          else
            (yyval.d) = s.value[index];
        }
++<<<<<<< HEAD
 +      Free((yyvsp[(1) - (4)].c));
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 380:
 +#line 4350 "Gmsh.y"
 +    {
 +      (yyval.d) = gmsh_yysymbols.count((yyvsp[(3) - (4)].c));
 +      Free((yyvsp[(3) - (4)].c));
 +    ;}
 +    break;
 +
 +  case 381:
 +#line 4355 "Gmsh.y"
 +=======
++=======
+       Free((yyvsp[-3].c));
++>>>>>>> upstream/2.10.1+dfsg1
      }
+ #line 10105 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 386:
- /* Line 1787 of yacc.c  */
- #line 4521 "Gmsh.y"
+   case 405:
+ #line 4724 "Gmsh.y" /* yacc.c:1646  */
      {
-       (yyval.d) = gmsh_yysymbols.count((yyvsp[(3) - (4)].c));
-       Free((yyvsp[(3) - (4)].c));
+       int index = (int)(yyvsp[-1].d);
+       if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
+ 	(yyval.d) = 0.;
+       }
+       else{
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
+         if((int)s.value.size() < index + 1){
+           yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
+           (yyval.d) = 0.;
+         }
+         else
+           (yyval.d) = s.value[index];
+       }
+       Free((yyvsp[-3].c));
+     }
+ #line 10127 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 406:
+ #line 4742 "Gmsh.y" /* yacc.c:1646  */
+     {
+       int index = (int)(yyvsp[-1].d);
+       if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
+ 	(yyval.d) = 0.;
+       }
+       else{
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
+         if((int)s.value.size() < index + 1){
+           yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
+           (yyval.d) = 0.;
+         }
+         else
+           (yyval.d) = s.value[index];
+       }
+       Free((yyvsp[-3].c));
+     }
+ #line 10149 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 407:
+ #line 4760 "Gmsh.y" /* yacc.c:1646  */
+     {
+       (yyval.d) = gmsh_yysymbols.count((yyvsp[-1].c));
+       Free((yyvsp[-1].c));
+     }
+ #line 10158 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 408:
+ #line 4765 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
+       (yyval.d) = !StatFile(tmp);
+       Free((yyvsp[-1].c));
+     }
+ #line 10168 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 409:
+ #line 4771 "Gmsh.y" /* yacc.c:1646  */
+     {
+       if(!gmsh_yysymbols.count((yyvsp[-2].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
+ 	(yyval.d) = 0.;
+       }
+       else{
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
+ 	(yyval.d) = s.value.size();
+       }
+       Free((yyvsp[-2].c));
      }
+ #line 10184 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 387:
 +/* Line 1787 of yacc.c  */
 +#line 4526 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
 +    {
 +      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (4)].c));
 +      (yyval.d) = !StatFile(tmp);
 +      Free((yyvsp[(3) - (4)].c));
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 382:
 +#line 4361 "Gmsh.y"
 +=======
++=======
+   case 410:
+ #line 4783 "Gmsh.y" /* yacc.c:1646  */
+     {
+       if(!gmsh_yysymbols.count((yyvsp[-1].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-1].c));
+ 	(yyval.d) = 0.;
+       }
+       else{
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-1].c)]);
+         if(s.value.empty()){
+           yymsg(0, "Uninitialized variable '%s'", (yyvsp[-1].c));
+           (yyval.d) = 0.;
+         }
+         else
+           (yyval.d) = (s.value[0] += (yyvsp[0].i));
+       }
+       Free((yyvsp[-1].c));
++>>>>>>> upstream/2.10.1+dfsg1
      }
+ #line 10205 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 388:
 +/* Line 1787 of yacc.c  */
 +#line 4532 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 411:
+ #line 4800 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!gmsh_yysymbols.count((yyvsp[(2) - (4)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(2) - (4)].c));
+       int index = (int)(yyvsp[-2].d);
+       if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
  	(yyval.d) = 0.;
        }
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (4)].c)]);
- 	(yyval.d) = s.value.size();
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-4].c)]);
+         if((int)s.value.size() < index + 1){
+           yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-4].c), index);
+           (yyval.d) = 0.;
+         }
+         else
+           (yyval.d) = (s.value[index] += (yyvsp[0].i));
        }
-       Free((yyvsp[(2) - (4)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 10227 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 383:
 +#line 4373 "Gmsh.y"
 +=======
 +  case 389:
 +/* Line 1787 of yacc.c  */
 +#line 4544 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 412:
+ #line 4818 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (2)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (2)].c));
+       int index = (int)(yyvsp[-2].d);
+       if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -15108,24 -10241,19 +18928,30 @@@
            (yyval.d) = 0.;
          }
          else
-           (yyval.d) = (s.value[0] += (yyvsp[(2) - (2)].i));
+           (yyval.d) = (s.value[index] += (yyvsp[0].i));
        }
-       Free((yyvsp[(1) - (2)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 10249 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 384:
 +#line 4390 "Gmsh.y"
 +=======
 +  case 390:
 +/* Line 1787 of yacc.c  */
 +#line 4561 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 413:
+ #line 4836 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int index = (int)(yyvsp[(3) - (5)].d);
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+       int index = (int)(yyvsp[-2].d);
+       if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -15135,24 -10263,19 +18961,30 @@@
            (yyval.d) = 0.;
          }
          else
-           (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+           (yyval.d) = (s.value[index] += (yyvsp[0].i));
        }
-       Free((yyvsp[(1) - (5)].c));
+       Free((yyvsp[-4].c));
      }
+ #line 10271 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 385:
 +#line 4408 "Gmsh.y"
 +=======
 +  case 391:
 +/* Line 1787 of yacc.c  */
 +#line 4579 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 414:
+ #line 4854 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       int index = (int)(yyvsp[(3) - (5)].d);
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+       int index = (int)(yyvsp[-2].d);
+       if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
  	(yyval.d) = 0.;
        }
        else{
@@@ -15162,153 -10285,110 +18994,211 @@@
            (yyval.d) = 0.;
          }
          else
-           (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+           (yyval.d) = (s.value[index] += (yyvsp[0].i));
        }
++<<<<<<< HEAD
 +      Free((yyvsp[(1) - (5)].c));
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 386:
 +#line 4429 "Gmsh.y"
 +=======
++=======
+       Free((yyvsp[-4].c));
++>>>>>>> upstream/2.10.1+dfsg1
      }
+ #line 10293 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 392:
 +/* Line 1787 of yacc.c  */
 +#line 4600 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 415:
+ #line 4875 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       NumberOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), (yyval.d));
-       Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
+       NumberOption(GMSH_GET, (yyvsp[-2].c), 0, (yyvsp[0].c), (yyval.d));
+       Free((yyvsp[-2].c)); Free((yyvsp[0].c));
      }
+ #line 10302 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 387:
 +#line 4434 "Gmsh.y"
 +=======
 +  case 393:
 +/* Line 1787 of yacc.c  */
 +#line 4605 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 416:
+ #line 4880 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), (yyval.d));
-       Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(6) - (6)].c));
+       NumberOption(GMSH_GET, (yyvsp[-5].c), (int)(yyvsp[-3].d), (yyvsp[0].c), (yyval.d));
+       Free((yyvsp[-5].c)); Free((yyvsp[0].c));
      }
+ #line 10311 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 388:
 +#line 4439 "Gmsh.y"
 +=======
 +  case 394:
 +/* Line 1787 of yacc.c  */
 +#line 4610 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 417:
+ #line 4885 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d)){
- 	d += (yyvsp[(4) - (4)].i);
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d);
+       if(NumberOption(GMSH_GET, (yyvsp[-3].c), 0, (yyvsp[-1].c), d)){
+ 	d += (yyvsp[0].i);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-3].c), 0, (yyvsp[-1].c), d);
  	(yyval.d) = d;
        }
-       Free((yyvsp[(1) - (4)].c)); Free((yyvsp[(3) - (4)].c));
+       Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
      }
+ #line 10325 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 389:
 +#line 4449 "Gmsh.y"
 +=======
 +  case 395:
 +/* Line 1787 of yacc.c  */
 +#line 4620 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 418:
+ #line 4895 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        double d = 0.;
-       if(NumberOption(GMSH_GET, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d)){
- 	d += (yyvsp[(7) - (7)].i);
- 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d);
+       if(NumberOption(GMSH_GET, (yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-1].c), d)){
+ 	d += (yyvsp[0].i);
+ 	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-1].c), d);
  	(yyval.d) = d;
        }
-       Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(6) - (7)].c));
+       Free((yyvsp[-6].c)); Free((yyvsp[-1].c));
      }
+ #line 10339 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 390:
 +#line 4459 "Gmsh.y"
 +=======
 +  case 396:
 +/* Line 1787 of yacc.c  */
 +#line 4630 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 419:
+ #line 4905 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.d) = Msg::GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
-       Free((yyvsp[(3) - (6)].c));
+       (yyval.d) = Msg::GetValue((yyvsp[-3].c), (yyvsp[-1].d));
+       Free((yyvsp[-3].c));
      }
+ #line 10348 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 391:
 +#line 4464 "Gmsh.y"
 +=======
 +  case 397:
 +/* Line 1787 of yacc.c  */
 +#line 4635 "Gmsh.y"
++=======
+   case 420:
+ #line 4910 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int matches = 0;
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
          double d;
-         List_Read((yyvsp[(3) - (6)].l), i, &d);
-         matches += List_Search((yyvsp[(5) - (6)].l), &d, fcmp_double);
+         List_Read((yyvsp[-3].l), i, &d);
+         matches += List_Search((yyvsp[-1].l), &d, fcmp_double);
        }
        (yyval.d) = matches;
-       Free((yyvsp[(3) - (6)].l)); Free((yyvsp[(5) - (6)].l));
+       Free((yyvsp[-3].l)); Free((yyvsp[-1].l));
      }
+ #line 10363 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 398:
 +/* Line 1787 of yacc.c  */
 +#line 4646 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 421:
+ #line 4921 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string s((yyvsp[(3) - (6)].c)), substr((yyvsp[(5) - (6)].c));
+       std::string s((yyvsp[-3].c)), substr((yyvsp[-1].c));
        if(s.find(substr) != std::string::npos)
          (yyval.d) = 1.;
        else
          (yyval.d) = 0.;
-       Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
+       Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
      }
+ #line 10376 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 392:
 +#line 4473 "Gmsh.y"
 +=======
 +  case 399:
 +/* Line 1787 of yacc.c  */
 +#line 4655 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 422:
+ #line 4930 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.d) = strcmp((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
-       Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
+       (yyval.d) = strcmp((yyvsp[-3].c), (yyvsp[-1].c));
+       Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
      }
+ #line 10385 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 393:
 +#line 4478 "Gmsh.y"
 +=======
 +  case 400:
 +/* Line 1787 of yacc.c  */
 +#line 4660 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 423:
+ #line 4935 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int align = 0, font = 0, fontsize = CTX::instance()->glFontSize;
-       if(List_Nbr((yyvsp[(3) - (4)].l)) % 2){
+       if(List_Nbr((yyvsp[-1].l)) % 2){
          yyerror("Number of text attributes should be even");
        }
        else{
@@@ -15326,351 -10406,231 +19216,495 @@@
  #endif
          }
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
        (yyval.d) = (double)((align<<16)|(font<<8)|(fontsize));
      }
+ #line 10413 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 394:
 +#line 4505 "Gmsh.y"
 +=======
 +  case 401:
 +/* Line 1787 of yacc.c  */
 +#line 4687 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 424:
+ #line 4962 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
+       memcpy((yyval.v), (yyvsp[0].v), 5*sizeof(double));
      }
+ #line 10421 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 395:
 +#line 4509 "Gmsh.y"
 +=======
 +  case 402:
 +/* Line 1787 of yacc.c  */
 +#line 4691 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 425:
+ #line 4966 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
+       for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[0].v)[i];
      }
+ #line 10429 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 396:
 +#line 4513 "Gmsh.y"
 +=======
 +  case 403:
 +/* Line 1787 of yacc.c  */
 +#line 4695 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 426:
+ #line 4970 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
+       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[0].v)[i];
      }
+ #line 10437 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 397:
 +#line 4517 "Gmsh.y"
 +=======
 +  case 404:
 +/* Line 1787 of yacc.c  */
 +#line 4699 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 427:
+ #line 4974 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
+       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[-2].v)[i] - (yyvsp[0].v)[i];
      }
+ #line 10445 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 398:
 +#line 4521 "Gmsh.y"
 +=======
 +  case 405:
 +/* Line 1787 of yacc.c  */
 +#line 4703 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 428:
+ #line 4978 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
+       for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[-2].v)[i] + (yyvsp[0].v)[i];
      }
+ #line 10453 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 399:
 +#line 4528 "Gmsh.y"
 +=======
 +  case 406:
 +/* Line 1787 of yacc.c  */
 +#line 4710 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 429:
+ #line 4985 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.v)[0] = (yyvsp[(2) - (11)].d);  (yyval.v)[1] = (yyvsp[(4) - (11)].d);  (yyval.v)[2] = (yyvsp[(6) - (11)].d);  (yyval.v)[3] = (yyvsp[(8) - (11)].d); (yyval.v)[4] = (yyvsp[(10) - (11)].d);
+       (yyval.v)[0] = (yyvsp[-9].d);  (yyval.v)[1] = (yyvsp[-7].d);  (yyval.v)[2] = (yyvsp[-5].d);  (yyval.v)[3] = (yyvsp[-3].d); (yyval.v)[4] = (yyvsp[-1].d);
      }
+ #line 10461 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 400:
 +#line 4532 "Gmsh.y"
 +=======
 +  case 407:
 +/* Line 1787 of yacc.c  */
 +#line 4714 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 430:
+ #line 4989 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.v)[0] = (yyvsp[(2) - (9)].d);  (yyval.v)[1] = (yyvsp[(4) - (9)].d);  (yyval.v)[2] = (yyvsp[(6) - (9)].d);  (yyval.v)[3] = (yyvsp[(8) - (9)].d); (yyval.v)[4] = 1.0;
+       (yyval.v)[0] = (yyvsp[-7].d);  (yyval.v)[1] = (yyvsp[-5].d);  (yyval.v)[2] = (yyvsp[-3].d);  (yyval.v)[3] = (yyvsp[-1].d); (yyval.v)[4] = 1.0;
      }
+ #line 10469 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 401:
 +#line 4536 "Gmsh.y"
 +=======
 +  case 408:
 +/* Line 1787 of yacc.c  */
 +#line 4718 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 431:
+ #line 4993 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.v)[0] = (yyvsp[(2) - (7)].d);  (yyval.v)[1] = (yyvsp[(4) - (7)].d);  (yyval.v)[2] = (yyvsp[(6) - (7)].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
+       (yyval.v)[0] = (yyvsp[-5].d);  (yyval.v)[1] = (yyvsp[-3].d);  (yyval.v)[2] = (yyvsp[-1].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
      }
+ #line 10477 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 402:
 +#line 4540 "Gmsh.y"
 +=======
 +  case 409:
 +/* Line 1787 of yacc.c  */
 +#line 4722 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 432:
+ #line 4997 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.v)[0] = (yyvsp[(2) - (7)].d);  (yyval.v)[1] = (yyvsp[(4) - (7)].d);  (yyval.v)[2] = (yyvsp[(6) - (7)].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
+       (yyval.v)[0] = (yyvsp[-5].d);  (yyval.v)[1] = (yyvsp[-3].d);  (yyval.v)[2] = (yyvsp[-1].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
      }
+ #line 10485 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 403:
 +#line 4547 "Gmsh.y"
 +=======
 +  case 410:
 +/* Line 1787 of yacc.c  */
 +#line 4729 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 433:
+ #line 5004 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(List_T*));
-       List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
+       List_Add((yyval.l), &((yyvsp[0].l)));
      }
+ #line 10494 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 404:
 +#line 4552 "Gmsh.y"
 +=======
 +  case 411:
 +/* Line 1787 of yacc.c  */
 +#line 4734 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 434:
+ #line 5009 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
+       List_Add((yyval.l), &((yyvsp[0].l)));
      }
+ #line 10502 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 405:
 +#line 4559 "Gmsh.y"
 +=======
 +  case 412:
 +/* Line 1787 of yacc.c  */
 +#line 4741 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 435:
+ #line 5016 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
+       List_Add((yyval.l), &((yyvsp[0].d)));
      }
+ #line 10511 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 406:
 +#line 4564 "Gmsh.y"
 +=======
 +  case 413:
 +/* Line 1787 of yacc.c  */
 +#line 4746 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 436:
+ #line 5021 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(1) - (1)].l);
+       (yyval.l) = (yyvsp[0].l);
      }
+ #line 10519 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 407:
 +#line 4568 "Gmsh.y"
 +=======
 +  case 414:
 +/* Line 1787 of yacc.c  */
 +#line 4750 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 437:
+ #line 5025 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        // creates an empty list
        (yyval.l) = List_Create(2, 1, sizeof(double));
      }
+ #line 10528 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 408:
 +#line 4573 "Gmsh.y"
 +=======
 +  case 415:
 +/* Line 1787 of yacc.c  */
 +#line 4755 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 438:
+ #line 5030 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(2) - (3)].l);
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 10536 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 409:
 +#line 4577 "Gmsh.y"
 +=======
 +  case 416:
 +/* Line 1787 of yacc.c  */
 +#line 4759 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 439:
+ #line 5034 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(3) - (4)].l);
+       (yyval.l) = (yyvsp[-1].l);
        for(int i = 0; i < List_Nbr((yyval.l)); i++){
  	double *pd = (double*)List_Pointer((yyval.l), i);
  	(*pd) = - (*pd);
        }
      }
+ #line 10548 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 410:
 +#line 4585 "Gmsh.y"
 +=======
 +  case 417:
 +/* Line 1787 of yacc.c  */
 +#line 4767 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 440:
+ #line 5042 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(4) - (5)].l);
+       (yyval.l) = (yyvsp[-1].l);
        for(int i = 0; i < List_Nbr((yyval.l)); i++){
  	double *pd = (double*)List_Pointer((yyval.l), i);
- 	(*pd) *= (yyvsp[(1) - (5)].d);
+ 	(*pd) *= (yyvsp[-4].d);
        }
      }
+ #line 10560 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 411:
 +#line 4596 "Gmsh.y"
 +=======
 +  case 418:
 +/* Line 1787 of yacc.c  */
 +#line 4778 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 441:
+ #line 5053 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(1) - (1)].l);
+       (yyval.l) = (yyvsp[0].l);
      }
+ #line 10568 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 412:
 +#line 4600 "Gmsh.y"
 +=======
 +  case 419:
 +/* Line 1787 of yacc.c  */
 +#line 4782 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 442:
+ #line 5057 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!strcmp((yyvsp[(1) - (1)].c), "*") || !strcmp((yyvsp[(1) - (1)].c), "all"))
+       if(!strcmp((yyvsp[0].c), "*") || !strcmp((yyvsp[0].c), "all"))
          (yyval.l) = 0;
        else{
          yyerror("Unknown special string for list replacement");
          (yyval.l) = List_Create(2, 1, sizeof(double));
        }
      }
+ #line 10581 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 413:
 +#line 4612 "Gmsh.y"
 +=======
 +  case 420:
 +/* Line 1787 of yacc.c  */
 +#line 4794 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 443:
+ #line 5069 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(2) - (2)].l);
+       (yyval.l) = (yyvsp[0].l);
        for(int i = 0; i < List_Nbr((yyval.l)); i++){
  	double *pd = (double*)List_Pointer((yyval.l), i);
  	(*pd) = - (*pd);
        }
      }
+ #line 10593 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 414:
 +#line 4620 "Gmsh.y"
 +=======
 +  case 421:
 +/* Line 1787 of yacc.c  */
 +#line 4802 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 444:
+ #line 5077 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(3) - (3)].l);
+       (yyval.l) = (yyvsp[0].l);
        for(int i = 0; i < List_Nbr((yyval.l)); i++){
  	double *pd = (double*)List_Pointer((yyval.l), i);
- 	(*pd) *= (yyvsp[(1) - (3)].d);
+ 	(*pd) *= (yyvsp[-2].d);
        }
      }
+ #line 10605 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 415:
 +#line 4628 "Gmsh.y"
 +=======
 +  case 422:
 +/* Line 1787 of yacc.c  */
 +#line 4810 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 445:
+ #line 5085 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       for(double d = (yyvsp[(1) - (3)].d); ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d <= (yyvsp[(3) - (3)].d)) : (d >= (yyvsp[(3) - (3)].d));
-           ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d += 1.) : (d -= 1.))
+       for(double d = (yyvsp[-2].d); ((yyvsp[-2].d) < (yyvsp[0].d)) ? (d <= (yyvsp[0].d)) : (d >= (yyvsp[0].d));
+           ((yyvsp[-2].d) < (yyvsp[0].d)) ? (d += 1.) : (d -= 1.))
  	List_Add((yyval.l), &d);
      }
+ #line 10616 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 416:
 +#line 4635 "Gmsh.y"
 +=======
 +  case 423:
 +/* Line 1787 of yacc.c  */
 +#line 4817 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 446:
+ #line 5092 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!(yyvsp[(5) - (5)].d)){  //|| ($1 < $3 && $5 < 0) || ($1 > $3 && $5 > 0)
-         yymsg(0, "Wrong increment in '%g:%g:%g'", (yyvsp[(1) - (5)].d), (yyvsp[(3) - (5)].d), (yyvsp[(5) - (5)].d));
+       if(!(yyvsp[0].d)){  //|| ($1 < $3 && $5 < 0) || ($1 > $3 && $5 > 0)
+         yymsg(0, "Wrong increment in '%g:%g:%g'", (yyvsp[-4].d), (yyvsp[-2].d), (yyvsp[0].d));
        }
        else
- 	for(double d = (yyvsp[(1) - (5)].d); ((yyvsp[(5) - (5)].d) > 0) ? (d <= (yyvsp[(3) - (5)].d)) : (d >= (yyvsp[(3) - (5)].d)); d += (yyvsp[(5) - (5)].d))
+ 	for(double d = (yyvsp[-4].d); ((yyvsp[0].d) > 0) ? (d <= (yyvsp[-2].d)) : (d >= (yyvsp[-2].d)); d += (yyvsp[0].d))
  	  List_Add((yyval.l), &d);
     }
+ #line 10630 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 417:
 +#line 4645 "Gmsh.y"
 +=======
 +  case 424:
 +/* Line 1787 of yacc.c  */
 +#line 4827 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 447:
+ #line 5102 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        // Returns the coordinates of a point and fills a list with it.
        // This allows to ensure e.g. that relative point positions are
@@@ -15715,67 -10675,43 +19749,97 @@@
      {
        (yyval.l) = GetAllElementaryEntityNumbers(1);
      }
+ #line 10679 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 418:
 +#line 4665 "Gmsh.y"
 +=======
 +  case 427:
 +/* Line 1787 of yacc.c  */
 +#line 4864 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 450:
+ #line 5139 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = GetAllElementaryEntityNumbers(2);
      }
+ #line 10687 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 419:
 +#line 4669 "Gmsh.y"
 +=======
 +  case 428:
 +/* Line 1787 of yacc.c  */
 +#line 4868 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 451:
+ #line 5143 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = GetAllElementaryEntityNumbers(3);
      }
+ #line 10695 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 420:
 +#line 4673 "Gmsh.y"
 +=======
 +  case 429:
 +/* Line 1787 of yacc.c  */
 +#line 4872 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 452:
+ #line 5147 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = GetAllPhysicalEntityNumbers(0);
      }
+ #line 10703 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 421:
 +#line 4677 "Gmsh.y"
 +=======
 +  case 430:
 +/* Line 1787 of yacc.c  */
 +#line 4876 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 453:
+ #line 5151 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = GetAllPhysicalEntityNumbers(1);
      }
+ #line 10711 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 422:
 +#line 4681 "Gmsh.y"
 +=======
 +  case 431:
 +/* Line 1787 of yacc.c  */
 +#line 4880 "Gmsh.y"
++=======
+   case 454:
+ #line 5155 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = GetAllPhysicalEntityNumbers(2);
      }
@@@ -15787,17 -10723,16 +19851,23 @@@
      {
        (yyval.l) = GetAllPhysicalEntityNumbers(3);
      }
+ #line 10727 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 433:
 +/* Line 1787 of yacc.c  */
 +#line 4888 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 456:
+ #line 5163 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(10, 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          double num;
-         List_Read((yyvsp[(4) - (5)].l), i, &num);
+         List_Read((yyvsp[-1].l), i, &num);
          PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_POINT);
          if(p){
            for(int j = 0; j < List_Nbr(p->Entities); j++){
@@@ -15819,23 -10754,18 +19889,29 @@@
            }
          }
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 10760 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 423:
 +#line 4710 "Gmsh.y"
 +=======
 +  case 434:
 +/* Line 1787 of yacc.c  */
 +#line 4917 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 457:
+ #line 5192 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(10, 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          double num;
-         List_Read((yyvsp[(4) - (5)].l), i, &num);
+         List_Read((yyvsp[-1].l), i, &num);
          PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_LINE);
          if(p){
            for(int j = 0; j < List_Nbr(p->Entities); j++){
@@@ -15857,23 -10787,18 +19933,29 @@@
            }
          }
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 10793 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 424:
 +#line 4739 "Gmsh.y"
 +=======
 +  case 435:
 +/* Line 1787 of yacc.c  */
 +#line 4946 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 458:
+ #line 5221 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(10, 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          double num;
-         List_Read((yyvsp[(4) - (5)].l), i, &num);
+         List_Read((yyvsp[-1].l), i, &num);
          PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_SURFACE);
          if(p){
            for(int j = 0; j < List_Nbr(p->Entities); j++){
@@@ -15895,23 -10820,18 +19977,29 @@@
            }
          }
        }
-       List_Delete((yyvsp[(4) - (5)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 10826 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 425:
 +#line 4768 "Gmsh.y"
 +=======
 +  case 436:
 +/* Line 1787 of yacc.c  */
 +#line 4975 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 459:
+ #line 5250 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(10, 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          double num;
-         List_Read((yyvsp[(4) - (5)].l), i, &num);
+         List_Read((yyvsp[-1].l), i, &num);
          PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_VOLUME);
          if(p){
            for(int j = 0; j < List_Nbr(p->Entities); j++){
@@@ -15999,420 -10919,305 +20087,570 @@@
  	List_Add((yyval.l), &d);
        }
      }
+ #line 10923 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 426:
 +#line 4797 "Gmsh.y"
 +=======
 +  case 441:
 +/* Line 1787 of yacc.c  */
 +#line 5056 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 464:
+ #line 5331 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
- 	Shape *s = (Shape*) List_Pointer((yyvsp[(1) - (1)].l), i);
+       (yyval.l) = List_Create(List_Nbr((yyvsp[0].l)), 1, sizeof(double));
+       for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
+ 	Shape *s = (Shape*) List_Pointer((yyvsp[0].l), i);
  	double d = s->Num;
  	List_Add((yyval.l), &d);
        }
-       List_Delete((yyvsp[(1) - (1)].l));
+       List_Delete((yyvsp[0].l));
      }
+ #line 10937 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 427:
 +#line 4807 "Gmsh.y"
 +=======
 +  case 442:
 +/* Line 1787 of yacc.c  */
 +#line 5066 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 465:
+ #line 5341 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
-       for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
- 	Shape *s = (Shape*) List_Pointer((yyvsp[(1) - (1)].l), i);
+       (yyval.l) = List_Create(List_Nbr((yyvsp[0].l)), 1, sizeof(double));
+       for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
+ 	Shape *s = (Shape*) List_Pointer((yyvsp[0].l), i);
  	double d = s->Num;
  	List_Add((yyval.l), &d);
        }
-       List_Delete((yyvsp[(1) - (1)].l));
+       List_Delete((yyvsp[0].l));
      }
+ #line 10951 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 428:
 +#line 4817 "Gmsh.y"
 +=======
 +  case 443:
 +/* Line 1787 of yacc.c  */
 +#line 5076 "Gmsh.y"
++=======
+   case 466:
+ #line 5351 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
  	for(unsigned int i = 0; i < s.value.size(); i++)
  	  List_Add((yyval.l), &s.value[i]);
        }
-       Free((yyvsp[(1) - (3)].c));
+       Free((yyvsp[-2].c));
      }
+ #line 10967 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 444:
 +/* Line 1787 of yacc.c  */
 +#line 5088 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 467:
+ #line 5363 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
  	for(unsigned int i = 0; i < s.value.size(); i++)
  	  List_Add((yyval.l), &s.value[i]);
        }
-       Free((yyvsp[(1) - (3)].c));
+       Free((yyvsp[-2].c));
      }
+ #line 10983 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 429:
 +#line 4829 "Gmsh.y"
 +=======
 +  case 445:
 +/* Line 1787 of yacc.c  */
 +#line 5100 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 468:
+ #line 5376 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!gmsh_yysymbols.count((yyvsp[(3) - (4)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(3) - (4)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-1].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-1].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(3) - (4)].c)]);
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-1].c)]);
  	for(unsigned int i = 0; i < s.value.size(); i++)
  	  List_Add((yyval.l), &s.value[i]);
        }
-       Free((yyvsp[(3) - (4)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 10999 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 430:
 +#line 4841 "Gmsh.y"
 +=======
 +  case 446:
 +/* Line 1787 of yacc.c  */
 +#line 5112 "Gmsh.y"
++=======
+   case 469:
+ #line 5388 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (6)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-5].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-5].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
- 	for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
- 	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[(4) - (6)].l), i));
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
+ 	for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
+ 	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[-2].l), i));
  	  if((int)s.value.size() < index + 1)
- 	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (6)].c), index);
+ 	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-5].c), index);
  	  else
  	    List_Add((yyval.l), &s.value[index]);
  	}
        }
-       Free((yyvsp[(1) - (6)].c));
-       List_Delete((yyvsp[(4) - (6)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 11021 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 447:
 +/* Line 1787 of yacc.c  */
 +#line 5130 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 470:
+ #line 5406 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
- 	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (6)].c));
+       if(!gmsh_yysymbols.count((yyvsp[-5].c)))
+ 	yymsg(0, "Unknown variable '%s'", (yyvsp[-5].c));
        else{
-         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
- 	for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
- 	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[(4) - (6)].l), i));
+         gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
+ 	for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
+ 	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[-2].l), i));
  	  if((int)s.value.size() < index + 1)
- 	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (6)].c), index);
+ 	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-5].c), index);
  	  else
  	    List_Add((yyval.l), &s.value[index]);
  	}
        }
-       Free((yyvsp[(1) - (6)].c));
-       List_Delete((yyvsp[(4) - (6)].l));
+       Free((yyvsp[-5].c));
+       List_Delete((yyvsp[-2].l));
      }
+ #line 11043 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 431:
 +#line 4862 "Gmsh.y"
 +=======
 +  case 448:
 +/* Line 1787 of yacc.c  */
 +#line 5151 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 471:
+ #line 5427 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(2, 1, sizeof(double));
-       List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
+       List_Add((yyval.l), &((yyvsp[0].d)));
      }
+ #line 11052 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 432:
 +#line 4867 "Gmsh.y"
 +=======
 +  case 449:
 +/* Line 1787 of yacc.c  */
 +#line 5156 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 472:
+ #line 5432 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(1) - (1)].l);
+       (yyval.l) = (yyvsp[0].l);
      }
+ #line 11060 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 433:
 +#line 4871 "Gmsh.y"
 +=======
 +  case 450:
 +/* Line 1787 of yacc.c  */
 +#line 5160 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 473:
+ #line 5436 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
+       List_Add((yyval.l), &((yyvsp[0].d)));
      }
+ #line 11068 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 434:
 +#line 4875 "Gmsh.y"
 +=======
 +  case 451:
 +/* Line 1787 of yacc.c  */
 +#line 5164 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 474:
+ #line 5440 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
  	double d;
- 	List_Read((yyvsp[(3) - (3)].l), i, &d);
+ 	List_Read((yyvsp[0].l), i, &d);
  	List_Add((yyval.l), &d);
        }
-       List_Delete((yyvsp[(3) - (3)].l));
+       List_Delete((yyvsp[0].l));
      }
+ #line 11081 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 435:
 +#line 4887 "Gmsh.y"
 +=======
 +  case 452:
 +/* Line 1787 of yacc.c  */
 +#line 5176 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 475:
+ #line 5452 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (9)].d), (int)(yyvsp[(4) - (9)].d), (int)(yyvsp[(6) - (9)].d), (int)(yyvsp[(8) - (9)].d));
+       (yyval.u) = CTX::instance()->packColor((int)(yyvsp[-7].d), (int)(yyvsp[-5].d), (int)(yyvsp[-3].d), (int)(yyvsp[-1].d));
      }
+ #line 11089 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 436:
 +#line 4891 "Gmsh.y"
 +=======
 +  case 453:
 +/* Line 1787 of yacc.c  */
 +#line 5180 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 476:
+ #line 5456 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (7)].d), (int)(yyvsp[(4) - (7)].d), (int)(yyvsp[(6) - (7)].d), 255);
+       (yyval.u) = CTX::instance()->packColor((int)(yyvsp[-5].d), (int)(yyvsp[-3].d), (int)(yyvsp[-1].d), 255);
      }
+ #line 11097 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 437:
 +#line 4903 "Gmsh.y"
 +=======
 +  case 454:
 +/* Line 1787 of yacc.c  */
 +#line 5192 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 477:
+ #line 5468 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int flag;
-       (yyval.u) = GetColorForString(-1, (yyvsp[(1) - (1)].c), &flag);
-       if(flag) yymsg(0, "Unknown color '%s'", (yyvsp[(1) - (1)].c));
-       Free((yyvsp[(1) - (1)].c));
+       (yyval.u) = GetColorForString(-1, (yyvsp[0].c), &flag);
+       if(flag) yymsg(0, "Unknown color '%s'", (yyvsp[0].c));
+       Free((yyvsp[0].c));
      }
+ #line 11108 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 438:
 +#line 4910 "Gmsh.y"
 +=======
 +  case 455:
 +/* Line 1787 of yacc.c  */
 +#line 5199 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 478:
+ #line 5475 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        unsigned int val = 0;
-       ColorOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(5) - (5)].c), val);
+       ColorOption(GMSH_GET, (yyvsp[-4].c), 0, (yyvsp[0].c), val);
        (yyval.u) = val;
-       Free((yyvsp[(1) - (5)].c)); Free((yyvsp[(5) - (5)].c));
+       Free((yyvsp[-4].c)); Free((yyvsp[0].c));
      }
+ #line 11119 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 439:
 +#line 4920 "Gmsh.y"
 +=======
 +  case 456:
 +/* Line 1787 of yacc.c  */
 +#line 5209 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 479:
+ #line 5485 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.l) = (yyvsp[(2) - (3)].l);
+       (yyval.l) = (yyvsp[-1].l);
      }
+ #line 11127 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 440:
 +#line 4924 "Gmsh.y"
 +=======
 +  case 457:
 +/* Line 1787 of yacc.c  */
 +#line 5213 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 480:
+ #line 5489 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(256, 10, sizeof(unsigned int));
-       GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
+       GmshColorTable *ct = GetColorTable((int)(yyvsp[-3].d));
        if(!ct)
- 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (6)].d));
+ 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[-3].d));
        else{
  	for(int i = 0; i < ct->size; i++)
  	  List_Add((yyval.l), &ct->table[i]);
        }
-       Free((yyvsp[(1) - (6)].c));
+       Free((yyvsp[-5].c));
      }
+ #line 11143 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 441:
 +#line 4939 "Gmsh.y"
 +=======
 +  case 458:
 +/* Line 1787 of yacc.c  */
 +#line 5228 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 481:
+ #line 5504 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(256, 10, sizeof(unsigned int));
-       List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
+       List_Add((yyval.l), &((yyvsp[0].u)));
      }
+ #line 11152 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 442:
 +#line 4944 "Gmsh.y"
 +=======
 +  case 459:
 +/* Line 1787 of yacc.c  */
 +#line 5233 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 482:
+ #line 5509 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
+       List_Add((yyval.l), &((yyvsp[0].u)));
      }
+ #line 11160 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 443:
 +#line 4951 "Gmsh.y"
 +=======
 +  case 460:
 +/* Line 1787 of yacc.c  */
 +#line 5240 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 483:
+ #line 5516 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.c) = (yyvsp[(1) - (1)].c);
+       (yyval.c) = (yyvsp[0].c);
      }
+ #line 11168 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 444:
 +#line 4955 "Gmsh.y"
 +=======
 +  case 461:
 +/* Line 1787 of yacc.c  */
 +#line 5244 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 484:
+ #line 5520 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if(!gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c))){
- 	yymsg(0, "Unknown string variable '%s'", (yyvsp[(1) - (1)].c));
- 	(yyval.c) = (yyvsp[(1) - (1)].c);
+       if(!gmsh_yystringsymbols.count((yyvsp[0].c))){
+ 	yymsg(0, "Unknown string variable '%s'", (yyvsp[0].c));
+ 	(yyval.c) = (yyvsp[0].c);
        }
        else{
- 	std::string val = gmsh_yystringsymbols[(yyvsp[(1) - (1)].c)];
+ 	std::string val = gmsh_yystringsymbols[(yyvsp[0].c)];
  	(yyval.c) = (char *)Malloc((val.size() + 1) * sizeof(char));
  	strcpy((yyval.c), val.c_str());
- 	Free((yyvsp[(1) - (1)].c));
+ 	Free((yyvsp[0].c));
        }
      }
+ #line 11185 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 445:
 +#line 4968 "Gmsh.y"
 +=======
 +  case 462:
 +/* Line 1787 of yacc.c  */
 +#line 5257 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 485:
+ #line 5533 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::string out;
-       StringOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), out);
+       StringOption(GMSH_GET, (yyvsp[-2].c), 0, (yyvsp[0].c), out);
        (yyval.c) = (char*)Malloc((out.size() + 1) * sizeof(char));
        strcpy((yyval.c), out.c_str());
-       Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
+       Free((yyvsp[-2].c)); Free((yyvsp[0].c));
      }
+ #line 11197 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 446:
 +#line 4976 "Gmsh.y"
 +=======
 +  case 463:
 +/* Line 1787 of yacc.c  */
 +#line 5265 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 486:
+ #line 5541 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        std::string out;
-       StringOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), out);
+       StringOption(GMSH_GET, (yyvsp[-5].c), (int)(yyvsp[-3].d), (yyvsp[0].c), out);
        (yyval.c) = (char*)Malloc((out.size() + 1) * sizeof(char));
        strcpy((yyval.c), out.c_str());
-       Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(6) - (6)].c));
+       Free((yyvsp[-5].c)); Free((yyvsp[0].c));
      }
+ #line 11209 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 447:
 +#line 4987 "Gmsh.y"
 +=======
 +  case 464:
 +/* Line 1787 of yacc.c  */
 +#line 5276 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 487:
+ #line 5552 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.c) = (yyvsp[(1) - (1)].c);
+       (yyval.c) = (yyvsp[0].c);
      }
+ #line 11217 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 448:
 +#line 4991 "Gmsh.y"
 +=======
 +  case 465:
 +/* Line 1787 of yacc.c  */
 +#line 5280 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 488:
+ #line 5556 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.c) = (char *)Malloc(32 * sizeof(char));
        time_t now;
@@@ -16420,225 -11225,186 +20658,317 @@@
        strcpy((yyval.c), ctime(&now));
        (yyval.c)[strlen((yyval.c)) - 1] = '\0';
      }
+ #line 11229 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 449:
 +#line 4999 "Gmsh.y"
 +=======
 +  case 466:
 +/* Line 1787 of yacc.c  */
 +#line 5288 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 489:
+ #line 5564 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string exe = Msg::GetExecutableName();
+       (yyval.c) = (char *)Malloc(exe.size() + 1);
+       strcpy((yyval.c), exe.c_str());
+     }
+ #line 11239 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 490:
+ #line 5570 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string action = Msg::GetGmshOnelabAction();
+       std::string action = Msg::GetOnelabAction();
        (yyval.c) = (char *)Malloc(action.size() + 1);
        strcpy((yyval.c), action.c_str());
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 450:
 +#line 5005 "Gmsh.y"
 +=======
      }
+ #line 11249 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 467:
 +/* Line 1787 of yacc.c  */
 +#line 5294 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 491:
+ #line 5576 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       const char *env = GetEnvironmentVar((yyvsp[(3) - (4)].c));
+       const char *env = GetEnvironmentVar((yyvsp[-1].c));
        if(!env) env = "";
        (yyval.c) = (char *)Malloc((sizeof(env) + 1) * sizeof(char));
        strcpy((yyval.c), env);
-       Free((yyvsp[(3) - (4)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 11261 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 451:
 +#line 5013 "Gmsh.y"
 +=======
 +  case 468:
 +/* Line 1787 of yacc.c  */
 +#line 5302 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 492:
+ #line 5584 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string s = Msg::GetString((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
+       std::string s = Msg::GetString((yyvsp[-3].c), (yyvsp[-1].c));
        (yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
        strcpy((yyval.c), s.c_str());
++<<<<<<< HEAD
 +      Free((yyvsp[(3) - (6)].c));
 +      Free((yyvsp[(5) - (6)].c));
 +<<<<<<< HEAD
 +    ;}
 +    break;
 +
 +  case 452:
 +#line 5021 "Gmsh.y"
 +=======
++=======
+       Free((yyvsp[-3].c));
+       Free((yyvsp[-1].c));
++>>>>>>> upstream/2.10.1+dfsg1
      }
+ #line 11273 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 469:
 +/* Line 1787 of yacc.c  */
 +#line 5310 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 493:
+ #line 5592 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string s = Msg::GetOnelabString((yyvsp[-1].c));
+       (yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
+       strcpy((yyval.c), s.c_str());
+       Free((yyvsp[-1].c));
+     }
+ #line 11284 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 494:
+ #line 5599 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int size = 1;
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++)
-         size += strlen(*(char**)List_Pointer((yyvsp[(3) - (4)].l), i)) + 1;
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+         size += strlen(*(char**)List_Pointer((yyvsp[-1].l), i)) + 1;
        (yyval.c) = (char*)Malloc(size * sizeof(char));
        (yyval.c)[0] = '\0';
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          char *s;
-         List_Read((yyvsp[(3) - (4)].l), i, &s);
+         List_Read((yyvsp[-1].l), i, &s);
          strcat((yyval.c), s);
          Free(s);
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 11303 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 453:
 +#line 5029 "Gmsh.y"
 +=======
 +  case 470:
 +/* Line 1787 of yacc.c  */
 +#line 5325 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 495:
+ #line 5614 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
+       (yyval.c) = (char *)Malloc((strlen((yyvsp[-1].c)) + 1) * sizeof(char));
        int i;
-       for(i = strlen((yyvsp[(3) - (4)].c)) - 1; i >= 0; i--){
- 	if((yyvsp[(3) - (4)].c)[i] == '.'){
- 	  strncpy((yyval.c), (yyvsp[(3) - (4)].c), i);
+       for(i = strlen((yyvsp[-1].c)) - 1; i >= 0; i--){
+ 	if((yyvsp[-1].c)[i] == '.'){
+ 	  strncpy((yyval.c), (yyvsp[-1].c), i);
  	  (yyval.c)[i]='\0';
  	  break;
  	}
        }
-       if(i <= 0) strcpy((yyval.c), (yyvsp[(3) - (4)].c));
-       Free((yyvsp[(3) - (4)].c));
+       if(i <= 0) strcpy((yyval.c), (yyvsp[-1].c));
+       Free((yyvsp[-1].c));
      }
+ #line 11321 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 454:
 +#line 5043 "Gmsh.y"
 +=======
 +  case 471:
 +/* Line 1787 of yacc.c  */
 +#line 5339 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 496:
+ #line 5628 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
+       (yyval.c) = (char *)Malloc((strlen((yyvsp[-1].c)) + 1) * sizeof(char));
        int i;
-       for(i = strlen((yyvsp[(3) - (4)].c)) - 1; i >= 0; i--){
- 	if((yyvsp[(3) - (4)].c)[i] == '/' || (yyvsp[(3) - (4)].c)[i] == '\\')
+       for(i = strlen((yyvsp[-1].c)) - 1; i >= 0; i--){
+ 	if((yyvsp[-1].c)[i] == '/' || (yyvsp[-1].c)[i] == '\\')
  	  break;
        }
        if(i <= 0)
- 	strcpy((yyval.c), (yyvsp[(3) - (4)].c));
+ 	strcpy((yyval.c), (yyvsp[-1].c));
        else
- 	strcpy((yyval.c), &(yyvsp[(3) - (4)].c)[i+1]);
-       Free((yyvsp[(3) - (4)].c));
+ 	strcpy((yyval.c), &(yyvsp[-1].c)[i+1]);
+       Free((yyvsp[-1].c));
      }
+ #line 11339 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 455:
 +#line 5057 "Gmsh.y"
 +=======
 +  case 472:
 +/* Line 1787 of yacc.c  */
 +#line 5353 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 497:
+ #line 5642 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string input = (yyvsp[(3) - (8)].c);
-       std::string substr_old = (yyvsp[(5) - (8)].c);
-       std::string substr_new = (yyvsp[(7) - (8)].c);
+       std::string input = (yyvsp[-5].c);
+       std::string substr_old = (yyvsp[-3].c);
+       std::string substr_new = (yyvsp[-1].c);
        std::string ret = ReplaceSubString(substr_old, substr_new, input);
        (yyval.c) = (char *)Malloc((ret.size() + 1) * sizeof(char));
        strcpy((yyval.c), ret.c_str());
-       Free((yyvsp[(3) - (8)].c));
-       Free((yyvsp[(5) - (8)].c));
-       Free((yyvsp[(7) - (8)].c));
+       Free((yyvsp[-5].c));
+       Free((yyvsp[-3].c));
+       Free((yyvsp[-1].c));
      }
+ #line 11355 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 456:
 +#line 5069 "Gmsh.y"
 +=======
 +  case 473:
 +/* Line 1787 of yacc.c  */
 +#line 5365 "Gmsh.y"
++=======
+   case 498:
+ #line 5654 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        int size = 1;
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++)
-         size += strlen(*(char**)List_Pointer((yyvsp[(3) - (4)].l), i)) + 1;
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+         size += strlen(*(char**)List_Pointer((yyvsp[-1].l), i)) + 1;
        (yyval.c) = (char*)Malloc(size * sizeof(char));
        (yyval.c)[0] = '\0';
-       for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+       for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
          char *s;
-         List_Read((yyvsp[(3) - (4)].l), i, &s);
+         List_Read((yyvsp[-1].l), i, &s);
          strcat((yyval.c), s);
          Free(s);
-         if(i != List_Nbr((yyvsp[(3) - (4)].l)) - 1) strcat((yyval.c), "\n");
+         if(i != List_Nbr((yyvsp[-1].l)) - 1) strcat((yyval.c), "\n");
        }
-       List_Delete((yyvsp[(3) - (4)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 11375 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 474:
 +/* Line 1787 of yacc.c  */
 +#line 5381 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 499:
+ #line 5670 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       if((yyvsp[(3) - (8)].d)){
-         (yyval.c) = (yyvsp[(5) - (8)].c);
-         Free((yyvsp[(7) - (8)].c));
+       if((yyvsp[-5].d)){
+         (yyval.c) = (yyvsp[-3].c);
+         Free((yyvsp[-1].c));
        }
 +<<<<<<< HEAD
 +      List_Delete((yyvsp[(3) - (4)].l));
 +    ;}
 +    break;
 +
 +  case 457:
 +#line 5085 "Gmsh.y"
 +=======
        else{
-         (yyval.c) = (yyvsp[(7) - (8)].c);
-         Free((yyvsp[(5) - (8)].c));
+         (yyval.c) = (yyvsp[-1].c);
+         Free((yyvsp[-3].c));
        }
      }
+ #line 11390 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 475:
 +/* Line 1787 of yacc.c  */
 +#line 5392 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 500:
+ #line 5681 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       (yyval.c) = (yyvsp[(3) - (4)].c);
+       (yyval.c) = (yyvsp[-1].c);
      }
+ #line 11398 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 458:
 +#line 5089 "Gmsh.y"
 +=======
 +  case 476:
 +/* Line 1787 of yacc.c  */
 +#line 5396 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 501:
+ #line 5685 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstring[5000];
-       int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
+       int i = PrintListOfDouble((yyvsp[-3].c), (yyvsp[-1].l), tmpstring);
        if(i < 0){
  	yymsg(0, "Too few arguments in Sprintf");
- 	(yyval.c) = (yyvsp[(3) - (6)].c);
+ 	(yyval.c) = (yyvsp[-3].c);
        }
        else if(i > 0){
  	yymsg(0, "%d extra argument%s in Sprintf", i, (i > 1) ? "s" : "");
@@@ -16647,147 -11413,105 +20977,199 @@@
        else{
  	(yyval.c) = (char*)Malloc((strlen(tmpstring) + 1) * sizeof(char));
  	strcpy((yyval.c), tmpstring);
- 	Free((yyvsp[(3) - (6)].c));
+ 	Free((yyvsp[-3].c));
        }
-       List_Delete((yyvsp[(5) - (6)].l));
+       List_Delete((yyvsp[-1].l));
      }
+ #line 11421 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 459:
 +#line 5108 "Gmsh.y"
 +    { floatOptions.clear(); charOptions.clear(); ;}
 +    break;
 +
 +  case 460:
 +#line 5110 "Gmsh.y"
 +    {
 +      std::string val((yyvsp[(3) - (6)].c));
 +      Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
 +      (yyval.c) = (char*)Malloc((val.size() + 1) * sizeof(char));
 +      strcpy((yyval.c), val.c_str());
 +      Free((yyvsp[(3) - (6)].c));
 +    ;}
 +    break;
 +
 +  case 461:
 +#line 5121 "Gmsh.y"
 +=======
 +  case 477:
 +/* Line 1787 of yacc.c  */
 +#line 5415 "Gmsh.y"
++=======
+   case 502:
+ #line 5704 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
-       std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (4)].c));
+       std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
        (yyval.c) = (char*)Malloc((tmp.size() + 1) * sizeof(char));
        strcpy((yyval.c), tmp.c_str());
-       Free((yyvsp[(3) - (4)].c));
+       Free((yyvsp[-1].c));
      }
+ #line 11432 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 478:
- /* Line 1787 of yacc.c  */
- #line 5422 "Gmsh.y"
+   case 503:
+ #line 5711 "Gmsh.y" /* yacc.c:1646  */
+     {
+       std::string tmp = SplitFileName(GetAbsolutePath(gmsh_yyname))[0];
+       (yyval.c) = (char*)Malloc((tmp.size() + 1) * sizeof(char));
+       strcpy((yyval.c), tmp.c_str());
+     }
+ #line 11442 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 504:
+ #line 5717 "Gmsh.y" /* yacc.c:1646  */
      { floatOptions.clear(); charOptions.clear(); }
+ #line 11448 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
-   case 479:
- /* Line 1787 of yacc.c  */
- #line 5424 "Gmsh.y"
+   case 505:
+ #line 5719 "Gmsh.y" /* yacc.c:1646  */
      {
-       std::string val((yyvsp[(3) - (6)].c));
+       std::string val((yyvsp[-3].c));
        Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
        (yyval.c) = (char*)Malloc((val.size() + 1) * sizeof(char));
        strcpy((yyval.c), val.c_str());
-       Free((yyvsp[(3) - (6)].c));
+       Free((yyvsp[-3].c));
      }
+ #line 11460 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
++<<<<<<< HEAD
 +  case 480:
 +/* Line 1787 of yacc.c  */
 +#line 5435 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 506:
+ #line 5730 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        (yyval.l) = List_Create(20,20,sizeof(char*));
-       List_Add((yyval.l), &((yyvsp[(1) - (1)].c)));
+       List_Add((yyval.l), &((yyvsp[0].c)));
      }
+ #line 11469 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 462:
 +#line 5126 "Gmsh.y"
 +    { List_Add((yyval.l), &((yyvsp[(3) - (3)].c))); ;}
 +    break;
 +
 +  case 463:
 +#line 5132 "Gmsh.y"
 +=======
 +  case 481:
 +/* Line 1787 of yacc.c  */
 +#line 5440 "Gmsh.y"
 +    { List_Add((yyval.l), &((yyvsp[(3) - (3)].c))); }
 +    break;
 +
 +  case 482:
 +/* Line 1787 of yacc.c  */
 +#line 5446 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 507:
+ #line 5735 "Gmsh.y" /* yacc.c:1646  */
+     { List_Add((yyval.l), &((yyvsp[0].c))); }
+ #line 11475 "Gmsh.tab.cpp" /* yacc.c:1646  */
+     break;
+ 
+   case 508:
+ #line 5741 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstr[256];
-       sprintf(tmpstr, "_%d", (int)(yyvsp[(4) - (5)].d));
-       (yyval.c) = (char *)Malloc((strlen((yyvsp[(1) - (5)].c))+strlen(tmpstr)+1)*sizeof(char));
-       strcpy((yyval.c), (yyvsp[(1) - (5)].c)); strcat((yyval.c), tmpstr);
-       Free((yyvsp[(1) - (5)].c));
+       sprintf(tmpstr, "_%d", (int)(yyvsp[-1].d));
+       (yyval.c) = (char *)Malloc((strlen((yyvsp[-4].c))+strlen(tmpstr)+1)*sizeof(char));
+       strcpy((yyval.c), (yyvsp[-4].c)); strcat((yyval.c), tmpstr);
+       Free((yyvsp[-4].c));
      }
+ #line 11487 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 464:
 +#line 5141 "Gmsh.y"
 +=======
 +  case 483:
 +/* Line 1787 of yacc.c  */
 +#line 5455 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   case 509:
+ #line 5750 "Gmsh.y" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      {
        char tmpstr[256];
-       sprintf(tmpstr, "_%d", (int)(yyvsp[(4) - (5)].d));
-       (yyval.c) = (char *)Malloc((strlen((yyvsp[(1) - (5)].c))+strlen(tmpstr)+1)*sizeof(char)) ;
-       strcpy((yyval.c), (yyvsp[(1) - (5)].c)) ; strcat((yyval.c), tmpstr) ;
-       Free((yyvsp[(1) - (5)].c));
+       sprintf(tmpstr, "_%d", (int)(yyvsp[-1].d));
+       (yyval.c) = (char *)Malloc((strlen((yyvsp[-4].c))+strlen(tmpstr)+1)*sizeof(char)) ;
+       strcpy((yyval.c), (yyvsp[-4].c)) ; strcat((yyval.c), tmpstr) ;
+       Free((yyvsp[-4].c));
      }
+ #line 11499 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  case 465:
 +#line 5154 "Gmsh.y"
 +    { (yyval.c) = (yyvsp[(1) - (1)].c); ;}
 +    break;
 +
 +  case 466:
 +#line 5157 "Gmsh.y"
 +    { (yyval.c) = (yyvsp[(1) - (1)].c); ;}
 +    break;
 +
 +
 +/* Line 1267 of yacc.c.  */
 +#line 10453 "Gmsh.tab.cpp"
 +=======
 +  case 484:
 +/* Line 1787 of yacc.c  */
 +#line 5468 "Gmsh.y"
 +    { (yyval.c) = (yyvsp[(1) - (1)].c); }
++=======
+   case 510:
+ #line 5763 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.c) = (yyvsp[0].c); }
+ #line 11505 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
      break;
  
-   case 485:
- /* Line 1787 of yacc.c  */
- #line 5471 "Gmsh.y"
-     { (yyval.c) = (yyvsp[(1) - (1)].c); }
+   case 511:
+ #line 5766 "Gmsh.y" /* yacc.c:1646  */
+     { (yyval.c) = (yyvsp[0].c); }
+ #line 11511 "Gmsh.tab.cpp" /* yacc.c:1646  */
      break;
  
  
++<<<<<<< HEAD
 +/* Line 1787 of yacc.c  */
 +#line 11481 "Gmsh.tab.cpp"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 11515 "Gmsh.tab.cpp" /* yacc.c:1646  */
++>>>>>>> upstream/2.10.1+dfsg1
        default: break;
      }
    /* User semantic actions sometimes alter yychar, and that requires
@@@ -17013,17 -11737,9 +21395,20 @@@ yyreturn
    if (yymsg != yymsgbuf)
      YYSTACK_FREE (yymsg);
  #endif
-   /* Make sure YYID is used.  */
-   return YYID (yyresult);
+   return yyresult;
  }
++<<<<<<< HEAD
 +
 +
 +<<<<<<< HEAD
 +#line 5161 "Gmsh.y"
 +=======
 +/* Line 2050 of yacc.c  */
 +#line 5475 "Gmsh.y"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 5770 "Gmsh.y" /* yacc.c:1906  */
++>>>>>>> upstream/2.10.1+dfsg1
  
  
  void assignVariable(const std::string &name, int index, int assignType,
diff --cc Parser/Gmsh.tab.hpp
index 1c7ba9d,59f1bd8..8fc0ff6
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@@ -40,487 -40,196 +40,673 @@@
  extern int gmsh_yydebug;
  #endif
  
- /* Tokens.  */
+ /* Token type.  */
  #ifndef YYTOKENTYPE
  # define YYTOKENTYPE
++<<<<<<< HEAD
 +   /* Put the tokens into the symbol table, so that GDB and other debuggers
 +      know about them.  */
 +   enum yytokentype {
 +     tDOUBLE = 258,
 +     tSTRING = 259,
 +     tBIGSTR = 260,
 +     tEND = 261,
 +     tAFFECT = 262,
 +     tDOTS = 263,
 +     tPi = 264,
 +     tMPI_Rank = 265,
 +     tMPI_Size = 266,
 +     tEuclidian = 267,
 +     tCoordinates = 268,
 +     tExp = 269,
 +     tLog = 270,
 +     tLog10 = 271,
 +     tSqrt = 272,
 +     tSin = 273,
 +     tAsin = 274,
 +     tCos = 275,
 +     tAcos = 276,
 +     tTan = 277,
 +     tRand = 278,
 +     tAtan = 279,
 +     tAtan2 = 280,
 +     tSinh = 281,
 +     tCosh = 282,
 +     tTanh = 283,
 +     tFabs = 284,
 +     tFloor = 285,
 +     tCeil = 286,
 +     tRound = 287,
 +     tFmod = 288,
 +     tModulo = 289,
 +     tHypot = 290,
 +     tList = 291,
 +     tPrintf = 292,
 +     tError = 293,
 +     tStr = 294,
 +     tSprintf = 295,
 +     tStrCat = 296,
 +     tStrPrefix = 297,
 +     tStrRelative = 298,
 +     tStrReplace = 299,
 +<<<<<<< HEAD
 +     tStrFind = 300,
 +     tStrCmp = 301,
 +     tTextAttributes = 302,
 +     tBoundingBox = 303,
 +     tDraw = 304,
 +     tSetChanged = 305,
 +     tToday = 306,
 +     tOnelabAction = 307,
 +     tSyncModel = 308,
 +     tCpu = 309,
 +     tMemory = 310,
 +     tTotalMemory = 311,
 +     tCreateTopology = 312,
 +     tCreateTopologyNoHoles = 313,
 +     tDistanceFunction = 314,
 +     tDefineConstant = 315,
 +     tUndefineConstant = 316,
 +     tDefineNumber = 317,
 +     tDefineString = 318,
 +     tPoint = 319,
 +     tCircle = 320,
 +     tEllipse = 321,
 +     tLine = 322,
 +     tSphere = 323,
 +     tPolarSphere = 324,
 +     tSurface = 325,
 +     tSpline = 326,
 +     tVolume = 327,
 +     tCharacteristic = 328,
 +     tLength = 329,
 +     tParametric = 330,
 +     tElliptic = 331,
 +     tRefineMesh = 332,
 +     tAdaptMesh = 333,
 +     tRelocateMesh = 334,
 +     tPlane = 335,
 +     tRuled = 336,
 +     tTransfinite = 337,
 +     tComplex = 338,
 +     tPhysical = 339,
 +     tCompound = 340,
 +     tPeriodic = 341,
 +     tUsing = 342,
 +     tPlugin = 343,
 +     tDegenerated = 344,
 +     tRecursive = 345,
 +     tRotate = 346,
 +     tTranslate = 347,
 +     tSymmetry = 348,
 +     tDilate = 349,
 +     tExtrude = 350,
 +     tLevelset = 351,
 +     tRecombine = 352,
 +     tSmoother = 353,
 +     tSplit = 354,
 +     tDelete = 355,
 +     tCoherence = 356,
 +     tIntersect = 357,
 +     tMeshAlgorithm = 358,
 +     tReverse = 359,
 +     tLayers = 360,
 +     tScaleLast = 361,
 +     tHole = 362,
 +     tAlias = 363,
 +     tAliasWithOptions = 364,
 +     tCopyOptions = 365,
 +     tQuadTriAddVerts = 366,
 +     tQuadTriNoNewVerts = 367,
 +     tQuadTriSngl = 368,
 +     tQuadTriDbl = 369,
 +     tRecombLaterals = 370,
 +     tTransfQuadTri = 371,
 +     tText2D = 372,
 +     tText3D = 373,
 +     tInterpolationScheme = 374,
 +     tTime = 375,
 +     tCombine = 376,
 +     tBSpline = 377,
 +     tBezier = 378,
 +     tNurbs = 379,
 +     tNurbsOrder = 380,
 +     tNurbsKnots = 381,
 +     tColor = 382,
 +     tColorTable = 383,
 +     tFor = 384,
 +     tIn = 385,
 +     tEndFor = 386,
 +     tIf = 387,
 +     tEndIf = 388,
 +     tExit = 389,
 +     tAbort = 390,
 +     tField = 391,
 +     tReturn = 392,
 +     tCall = 393,
 +     tFunction = 394,
 +     tShow = 395,
 +     tHide = 396,
 +     tGetValue = 397,
 +     tGetEnv = 398,
 +     tGetString = 399,
 +     tHomology = 400,
 +     tCohomology = 401,
 +     tBetti = 402,
 +     tSetOrder = 403,
 +     tExists = 404,
 +     tFileExists = 405,
 +     tGMSH_MAJOR_VERSION = 406,
 +     tGMSH_MINOR_VERSION = 407,
 +     tGMSH_PATCH_VERSION = 408,
 +     tAFFECTDIVIDE = 409,
 +     tAFFECTTIMES = 410,
 +     tAFFECTMINUS = 411,
 +     tAFFECTPLUS = 412,
 +     tOR = 413,
 +     tAND = 414,
 +     tNOTEQUAL = 415,
 +     tEQUAL = 416,
 +     tGREATEROREQUAL = 417,
 +     tLESSOREQUAL = 418,
 +     UNARYPREC = 419,
 +     tMINUSMINUS = 420,
 +     tPLUSPLUS = 421
 +   };
 +#endif
 +/* Tokens.  */
 +#define tDOUBLE 258
 +#define tSTRING 259
 +#define tBIGSTR 260
 +#define tEND 261
 +#define tAFFECT 262
 +#define tDOTS 263
 +#define tPi 264
 +#define tMPI_Rank 265
 +#define tMPI_Size 266
 +#define tEuclidian 267
 +#define tCoordinates 268
 +#define tExp 269
 +#define tLog 270
 +#define tLog10 271
 +#define tSqrt 272
 +#define tSin 273
 +#define tAsin 274
 +#define tCos 275
 +#define tAcos 276
 +#define tTan 277
 +#define tRand 278
 +#define tAtan 279
 +#define tAtan2 280
 +#define tSinh 281
 +#define tCosh 282
 +#define tTanh 283
 +#define tFabs 284
 +#define tFloor 285
 +#define tCeil 286
 +#define tRound 287
 +#define tFmod 288
 +#define tModulo 289
 +#define tHypot 290
 +#define tList 291
 +#define tPrintf 292
 +#define tError 293
 +#define tStr 294
 +#define tSprintf 295
 +#define tStrCat 296
 +#define tStrPrefix 297
 +#define tStrRelative 298
 +#define tStrReplace 299
 +#define tStrFind 300
 +#define tStrCmp 301
 +#define tTextAttributes 302
 +#define tBoundingBox 303
 +#define tDraw 304
 +#define tSetChanged 305
 +#define tToday 306
 +#define tOnelabAction 307
 +#define tSyncModel 308
 +#define tCpu 309
 +#define tMemory 310
 +#define tTotalMemory 311
 +#define tCreateTopology 312
 +#define tCreateTopologyNoHoles 313
 +#define tDistanceFunction 314
 +#define tDefineConstant 315
 +#define tUndefineConstant 316
 +#define tDefineNumber 317
 +#define tDefineString 318
 +#define tPoint 319
 +#define tCircle 320
 +#define tEllipse 321
 +#define tLine 322
 +#define tSphere 323
 +#define tPolarSphere 324
 +#define tSurface 325
 +#define tSpline 326
 +#define tVolume 327
 +#define tCharacteristic 328
 +#define tLength 329
 +#define tParametric 330
 +#define tElliptic 331
 +#define tRefineMesh 332
 +#define tAdaptMesh 333
 +#define tRelocateMesh 334
 +#define tPlane 335
 +#define tRuled 336
 +#define tTransfinite 337
 +#define tComplex 338
 +#define tPhysical 339
 +#define tCompound 340
 +#define tPeriodic 341
 +#define tUsing 342
 +#define tPlugin 343
 +#define tDegenerated 344
 +#define tRecursive 345
 +#define tRotate 346
 +#define tTranslate 347
 +#define tSymmetry 348
 +#define tDilate 349
 +#define tExtrude 350
 +#define tLevelset 351
 +#define tRecombine 352
 +#define tSmoother 353
 +#define tSplit 354
 +#define tDelete 355
 +#define tCoherence 356
 +#define tIntersect 357
 +#define tMeshAlgorithm 358
 +#define tReverse 359
 +#define tLayers 360
 +#define tScaleLast 361
 +#define tHole 362
 +#define tAlias 363
 +#define tAliasWithOptions 364
 +#define tCopyOptions 365
 +#define tQuadTriAddVerts 366
 +#define tQuadTriNoNewVerts 367
 +#define tQuadTriSngl 368
 +#define tQuadTriDbl 369
 +#define tRecombLaterals 370
 +#define tTransfQuadTri 371
 +#define tText2D 372
 +#define tText3D 373
 +#define tInterpolationScheme 374
 +#define tTime 375
 +#define tCombine 376
 +#define tBSpline 377
 +#define tBezier 378
 +#define tNurbs 379
 +#define tNurbsOrder 380
 +#define tNurbsKnots 381
 +#define tColor 382
 +#define tColorTable 383
 +#define tFor 384
 +#define tIn 385
 +#define tEndFor 386
 +#define tIf 387
 +#define tEndIf 388
 +#define tExit 389
 +#define tAbort 390
 +#define tField 391
 +#define tReturn 392
 +#define tCall 393
 +#define tFunction 394
 +#define tShow 395
 +#define tHide 396
 +#define tGetValue 397
 +#define tGetEnv 398
 +#define tGetString 399
 +#define tHomology 400
 +#define tCohomology 401
 +#define tBetti 402
 +#define tSetOrder 403
 +#define tExists 404
 +#define tFileExists 405
 +#define tGMSH_MAJOR_VERSION 406
 +#define tGMSH_MINOR_VERSION 407
 +#define tGMSH_PATCH_VERSION 408
 +#define tAFFECTDIVIDE 409
 +#define tAFFECTTIMES 410
 +#define tAFFECTMINUS 411
 +#define tAFFECTPLUS 412
 +#define tOR 413
 +#define tAND 414
 +#define tNOTEQUAL 415
 +#define tEQUAL 416
 +#define tGREATEROREQUAL 417
 +#define tLESSOREQUAL 418
 +#define UNARYPREC 419
 +#define tMINUSMINUS 420
 +#define tPLUSPLUS 421
 +
 +
 +=======
 +     tFind = 300,
 +     tStrFind = 301,
 +     tStrCmp = 302,
 +     tStrChoice = 303,
 +     tTextAttributes = 304,
 +     tBoundingBox = 305,
 +     tDraw = 306,
 +     tSetChanged = 307,
 +     tToday = 308,
 +     tFixRelativePath = 309,
 +     tSyncModel = 310,
 +     tOnelabAction = 311,
 +     tOnelabRun = 312,
 +     tCpu = 313,
 +     tMemory = 314,
 +     tTotalMemory = 315,
 +     tCreateTopology = 316,
 +     tCreateTopologyNoHoles = 317,
 +     tDistanceFunction = 318,
 +     tDefineConstant = 319,
 +     tUndefineConstant = 320,
 +     tDefineNumber = 321,
 +     tDefineString = 322,
 +     tPoint = 323,
 +     tCircle = 324,
 +     tEllipse = 325,
 +     tLine = 326,
 +     tSphere = 327,
 +     tPolarSphere = 328,
 +     tSurface = 329,
 +     tSpline = 330,
 +     tVolume = 331,
 +     tCharacteristic = 332,
 +     tLength = 333,
 +     tParametric = 334,
 +     tElliptic = 335,
 +     tRefineMesh = 336,
 +     tAdaptMesh = 337,
 +     tRelocateMesh = 338,
 +     tPlane = 339,
 +     tRuled = 340,
 +     tTransfinite = 341,
 +     tComplex = 342,
 +     tPhysical = 343,
 +     tCompound = 344,
 +     tPeriodic = 345,
 +     tUsing = 346,
 +     tPlugin = 347,
 +     tDegenerated = 348,
 +     tRecursive = 349,
 +     tRotate = 350,
 +     tTranslate = 351,
 +     tSymmetry = 352,
 +     tDilate = 353,
 +     tExtrude = 354,
 +     tLevelset = 355,
 +     tRecombine = 356,
 +     tSmoother = 357,
 +     tSplit = 358,
 +     tDelete = 359,
 +     tCoherence = 360,
 +     tIntersect = 361,
 +     tMeshAlgorithm = 362,
 +     tReverse = 363,
 +     tLayers = 364,
 +     tScaleLast = 365,
 +     tHole = 366,
 +     tAlias = 367,
 +     tAliasWithOptions = 368,
 +     tCopyOptions = 369,
 +     tQuadTriAddVerts = 370,
 +     tQuadTriNoNewVerts = 371,
 +     tQuadTriSngl = 372,
 +     tQuadTriDbl = 373,
 +     tRecombLaterals = 374,
 +     tTransfQuadTri = 375,
 +     tText2D = 376,
 +     tText3D = 377,
 +     tInterpolationScheme = 378,
 +     tTime = 379,
 +     tCombine = 380,
 +     tBSpline = 381,
 +     tBezier = 382,
 +     tNurbs = 383,
 +     tNurbsOrder = 384,
 +     tNurbsKnots = 385,
 +     tColor = 386,
 +     tColorTable = 387,
 +     tFor = 388,
 +     tIn = 389,
 +     tEndFor = 390,
 +     tIf = 391,
 +     tEndIf = 392,
 +     tExit = 393,
 +     tAbort = 394,
 +     tField = 395,
 +     tReturn = 396,
 +     tCall = 397,
 +     tFunction = 398,
 +     tShow = 399,
 +     tHide = 400,
 +     tGetValue = 401,
 +     tGetEnv = 402,
 +     tGetString = 403,
 +     tHomology = 404,
 +     tCohomology = 405,
 +     tBetti = 406,
 +     tSetOrder = 407,
 +     tExists = 408,
 +     tFileExists = 409,
 +     tGMSH_MAJOR_VERSION = 410,
 +     tGMSH_MINOR_VERSION = 411,
 +     tGMSH_PATCH_VERSION = 412,
 +     tAFFECTDIVIDE = 413,
 +     tAFFECTTIMES = 414,
 +     tAFFECTMINUS = 415,
 +     tAFFECTPLUS = 416,
 +     tOR = 417,
 +     tAND = 418,
 +     tNOTEQUAL = 419,
 +     tEQUAL = 420,
 +     tGREATEROREQUAL = 421,
 +     tLESSOREQUAL = 422,
 +     UNARYPREC = 423,
 +     tMINUSMINUS = 424,
 +     tPLUSPLUS = 425
 +   };
++=======
+   enum yytokentype
+   {
+     tDOUBLE = 258,
+     tSTRING = 259,
+     tBIGSTR = 260,
+     tEND = 261,
+     tAFFECT = 262,
+     tDOTS = 263,
+     tPi = 264,
+     tMPI_Rank = 265,
+     tMPI_Size = 266,
+     tEuclidian = 267,
+     tCoordinates = 268,
+     tExp = 269,
+     tLog = 270,
+     tLog10 = 271,
+     tSqrt = 272,
+     tSin = 273,
+     tAsin = 274,
+     tCos = 275,
+     tAcos = 276,
+     tTan = 277,
+     tRand = 278,
+     tAtan = 279,
+     tAtan2 = 280,
+     tSinh = 281,
+     tCosh = 282,
+     tTanh = 283,
+     tFabs = 284,
+     tFloor = 285,
+     tCeil = 286,
+     tRound = 287,
+     tFmod = 288,
+     tModulo = 289,
+     tHypot = 290,
+     tList = 291,
+     tPrintf = 292,
+     tError = 293,
+     tStr = 294,
+     tSprintf = 295,
+     tStrCat = 296,
+     tStrPrefix = 297,
+     tStrRelative = 298,
+     tStrReplace = 299,
+     tFind = 300,
+     tStrFind = 301,
+     tStrCmp = 302,
+     tStrChoice = 303,
+     tTextAttributes = 304,
+     tBoundingBox = 305,
+     tDraw = 306,
+     tSetChanged = 307,
+     tToday = 308,
+     tFixRelativePath = 309,
+     tCurrentDirectory = 310,
+     tSyncModel = 311,
+     tNewModel = 312,
+     tOnelabAction = 313,
+     tOnelabRun = 314,
+     tCpu = 315,
+     tMemory = 316,
+     tTotalMemory = 317,
+     tCreateTopology = 318,
+     tCreateTopologyNoHoles = 319,
+     tDistanceFunction = 320,
+     tDefineConstant = 321,
+     tUndefineConstant = 322,
+     tDefineNumber = 323,
+     tDefineString = 324,
+     tSetNumber = 325,
+     tSetString = 326,
+     tPoint = 327,
+     tCircle = 328,
+     tEllipse = 329,
+     tLine = 330,
+     tSphere = 331,
+     tPolarSphere = 332,
+     tSurface = 333,
+     tSpline = 334,
+     tVolume = 335,
+     tCharacteristic = 336,
+     tLength = 337,
+     tParametric = 338,
+     tElliptic = 339,
+     tRefineMesh = 340,
+     tAdaptMesh = 341,
+     tRelocateMesh = 342,
+     tPlane = 343,
+     tRuled = 344,
+     tTransfinite = 345,
+     tComplex = 346,
+     tPhysical = 347,
+     tCompound = 348,
+     tPeriodic = 349,
+     tUsing = 350,
+     tPlugin = 351,
+     tDegenerated = 352,
+     tRecursive = 353,
+     tRotate = 354,
+     tTranslate = 355,
+     tSymmetry = 356,
+     tDilate = 357,
+     tExtrude = 358,
+     tLevelset = 359,
+     tAffine = 360,
+     tRecombine = 361,
+     tSmoother = 362,
+     tSplit = 363,
+     tDelete = 364,
+     tCoherence = 365,
+     tIntersect = 366,
+     tMeshAlgorithm = 367,
+     tReverse = 368,
+     tLayers = 369,
+     tScaleLast = 370,
+     tHole = 371,
+     tAlias = 372,
+     tAliasWithOptions = 373,
+     tCopyOptions = 374,
+     tQuadTriAddVerts = 375,
+     tQuadTriNoNewVerts = 376,
+     tQuadTriSngl = 377,
+     tQuadTriDbl = 378,
+     tRecombLaterals = 379,
+     tTransfQuadTri = 380,
+     tText2D = 381,
+     tText3D = 382,
+     tInterpolationScheme = 383,
+     tTime = 384,
+     tCombine = 385,
+     tBSpline = 386,
+     tBezier = 387,
+     tNurbs = 388,
+     tNurbsOrder = 389,
+     tNurbsKnots = 390,
+     tColor = 391,
+     tColorTable = 392,
+     tFor = 393,
+     tIn = 394,
+     tEndFor = 395,
+     tIf = 396,
+     tEndIf = 397,
+     tExit = 398,
+     tAbort = 399,
+     tField = 400,
+     tReturn = 401,
+     tCall = 402,
+     tMacro = 403,
+     tShow = 404,
+     tHide = 405,
+     tGetValue = 406,
+     tGetEnv = 407,
+     tGetString = 408,
+     tGetNumber = 409,
+     tHomology = 410,
+     tCohomology = 411,
+     tBetti = 412,
+     tSetOrder = 413,
+     tExists = 414,
+     tFileExists = 415,
+     tGMSH_MAJOR_VERSION = 416,
+     tGMSH_MINOR_VERSION = 417,
+     tGMSH_PATCH_VERSION = 418,
+     tGmshExecutableName = 419,
+     tSetPartition = 420,
+     tAFFECTPLUS = 421,
+     tAFFECTMINUS = 422,
+     tAFFECTTIMES = 423,
+     tAFFECTDIVIDE = 424,
+     tOR = 425,
+     tAND = 426,
+     tEQUAL = 427,
+     tNOTEQUAL = 428,
+     tLESSOREQUAL = 429,
+     tGREATEROREQUAL = 430,
+     tPLUSPLUS = 431,
+     tMINUSMINUS = 432,
+     UNARYPREC = 433
+   };
++>>>>>>> upstream/2.10.1+dfsg1
  #endif
 +>>>>>>> upstream/2.9.3+dfsg1
  
- 
+ /* Value type.  */
  #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
++<<<<<<< HEAD
 +typedef union YYSTYPE
 +<<<<<<< HEAD
 +#line 100 "Gmsh.y"
 +=======
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 
+ union YYSTYPE
++>>>>>>> upstream/2.10.1+dfsg1
  {
- /* Line 2053 of yacc.c  */
- #line 99 "Gmsh.y"
+ #line 105 "Gmsh.y" /* yacc.c:1909  */
  
    char *c;
    int i;
@@@ -529,20 -238,12 +715,23 @@@
    double v[5];
    Shape s;
    List_T *l;
 +<<<<<<< HEAD
 +}
 +/* Line 1529 of yacc.c.  */
 +#line 391 "Gmsh.tab.hpp"
 +	YYSTYPE;
 +=======
  
+ #line 243 "Gmsh.tab.hpp" /* yacc.c:1909  */
+ };
  
- /* Line 2053 of yacc.c  */
- #line 238 "Gmsh.tab.hpp"
- } YYSTYPE;
+ typedef union YYSTYPE YYSTYPE;
  # define YYSTYPE_IS_TRIVIAL 1
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++=======
++>>>>>>> upstream/2.10.1+dfsg1
  # define YYSTYPE_IS_DECLARED 1
  #endif
  
diff --cc Parser/Gmsh.y
index f361bb2,08c1c6c..bb86bbe
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@@ -116,12 -122,9 +122,17 @@@ struct doubleXstring
  %token tPrintf tError tStr tSprintf tStrCat tStrPrefix tStrRelative tStrReplace
  %token tFind tStrFind tStrCmp tStrChoice
  %token tTextAttributes
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +%token tBoundingBox tDraw tSetChanged tToday tOnelabAction tSyncModel
 +=======
 +%token tBoundingBox tDraw tSetChanged tToday tFixRelativePath tSyncModel
++=======
+ %token tBoundingBox tDraw tSetChanged tToday tFixRelativePath tCurrentDirectory
+ %token tSyncModel tNewModel
++>>>>>>> upstream/2.10.1+dfsg1
  %token tOnelabAction tOnelabRun
 +>>>>>>> upstream/2.9.3+dfsg1
  %token tCpu tMemory tTotalMemory
  %token tCreateTopology tCreateTopologyNoHoles
  %token tDistanceFunction tDefineConstant tUndefineConstant
@@@ -752,12 -763,7 +775,16 @@@ Affectation 
        Free($1);
        List_Delete($5);
      }
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  | tSTRING '[' FExpr ']' NumericAffectation FExpr tEND
 +    {
 +      assignVariable($1, (int)$3, $5, $6);
 +=======
 +  | StringIndex '[' ']' NumericAffectation ListOfDouble tEND
++=======
+   | StringIndex LP RP NumericAffectation ListOfDouble tEND
++>>>>>>> upstream/2.10.1+dfsg1
      {
        gmsh_yysymbol &s(gmsh_yysymbols[$1]);
        s.list = true;
@@@ -5333,15 -5588,13 +5623,25 @@@ StringExpr 
        Free($3);
        Free($5);
      }
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +  | tStrCat LP StringExprVar ',' StringExprVar RP
 +    {
 +      $$ = (char *)Malloc((strlen($3) + strlen($5) + 1) * sizeof(char));
 +      strcpy($$, $3);
 +      strcat($$, $5);
 +      Free($3);
 +      Free($5);
 +=======
++=======
+   | tGetString '(' StringExprVar ')'
+     {
+       std::string s = Msg::GetOnelabString($3);
+       $$ = (char *)Malloc((s.size() + 1) * sizeof(char));
+       strcpy($$, s.c_str());
+       Free($3);
+     }
++>>>>>>> upstream/2.10.1+dfsg1
    | tStrCat LP RecursiveListOfStringExprVar RP
      {
        int size = 1;
diff --cc Parser/Gmsh.yy.cpp
index 5b86f58,9cbc52a..5637dbb
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@@ -380,13 -380,8 +380,18 @@@ static void yy_fatal_error (yyconst cha
  	*yy_cp = '\0'; \
  	(yy_c_buf_p) = yy_cp;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#define YY_NUM_RULES 187
 +#define YY_END_OF_BUFFER 188
 +=======
 +#define YY_NUM_RULES 191
 +#define YY_END_OF_BUFFER 192
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #define YY_NUM_RULES 201
+ #define YY_END_OF_BUFFER 202
++>>>>>>> upstream/2.10.1+dfsg1
  /* This struct is not used in this scanner,
     but its presence is necessary. */
  struct yy_trans_info
@@@ -394,216 -389,119 +399,332 @@@
  	flex_int32_t yy_verify;
  	flex_int32_t yy_nxt;
  	};
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +static yyconst flex_int16_t yy_accept[909] =
 +    {   0,
 +        0,    0,  188,  186,    1,    1,  186,    5,  186,    6,
 +      186,  186,  186,  186,  186,  181,   21,    2,  186,   16,
 +      186,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  186,   28,   24,   19,   25,   17,
 +       26,   18,    0,  183,    3,    4,   20,  182,  181,    0,
 +       29,   27,   30,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +
 +      185,  103,  102,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  124,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  167,  168,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,   23,   22,    0,
 +      182,    0,    0,  184,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,   54,   65,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,   74,  185,
 +      185,  185,  185,  185,  185,   90,  185,  185,  185,  185,
 +
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  110,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      150,  185,  185,  185,  185,  185,  156,  185,  185,  185,
 +      185,  175,  185,  185,  185,  185,  185,  185,  185,  185,
 +        0,  183,    0,    0,  182,  185,   32,  185,  185,  185,
 +      185,  185,   37,   39,  185,  185,  185,  185,   62,  185,
 +       47,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +       53,  185,  185,  185,  185,  185,   72,  185,  185,  185,
 +
 +      185,  185,  185,   83,  185,   85,  185,  185,  185,   89,
 +      185,  185,  185,  185,  185,   98,   99,  185,  185,  185,
 +      185,  185,  185,  185,  185,  108,  109,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  141,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  164,  151,  185,
 +      185,  185,  185,  149,  185,  185,  185,  185,  185,  185,
 +      185,  170,  174,  185,  185,  185,  185,  185,  185,  185,
 +       10,   15,    9,    8,  185,   12,   14,    0,  182,   31,
 +      185,   35,  185,  185,  185,   41,  185,   43,  185,  185,
 +
 +      185,  185,  185,  185,  185,   57,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,   80,   82,
 +      185,  185,  185,   86,  185,   88,  185,  185,  185,  185,
 +      185,  185,  101,  185,  185,  106,  185,  185,  185,  111,
 +      185,  185,  185,  185,  185,  119,  185,  121,  185,  185,
 +      185,  125,  185,  126,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  139,  140,  185,  185,  185,  185,
 +      185,  185,  154,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  176,  185,  185,  185,  179,  185,   11,
 +      185,   13,  185,  185,   34,   38,   40,  185,   44,  185,
 +
 +      185,  185,   48,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,   69,   71,  185,  185,   79,  185,
 +       84,  185,  185,  185,  185,  185,   92,  185,  185,  185,
 +      185,  185,  112,  107,  185,  185,  185,  118,  185,  115,
 +      185,  185,  185,  185,  130,  185,  129,  185,  185,  185,
 +      185,  185,  144,  185,  138,  185,  185,  185,  185,  152,
 +      153,  185,  158,  163,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  180,    7,  185,  185,
 +       42,   45,  185,  185,  185,  185,  185,  185,   52,   56,
 +      185,  185,  185,  185,  185,  185,  185,  185,   76,  185,
 +
 +      185,  185,   77,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  145,  185,
 +      185,  185,  185,  157,  162,  185,  185,  185,  155,  185,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,   59,  185,  185,  185,  185,
 +      185,  185,  185,   75,   78,  185,  185,   91,  185,  185,
 +      185,  185,   94,  100,  185,  185,  113,  116,  117,  185,
 +      185,  185,  122,  123,  185,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,  185,  185,  148,  147,  185,  185,
 +
 +      185,  165,  185,  185,  185,  185,  185,  185,  185,   33,
 +      185,  185,  185,  185,   50,  185,  185,  185,  185,  185,
 +      185,  185,  185,  185,   81,  185,  185,  185,  185,   93,
 +      185,  104,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  135,  137,  185,  185,  185,  185,  160,  185,  185,
 +      166,  185,  185,  185,  185,  173,  185,  185,  185,   61,
 +      185,   51,   58,  185,  185,  185,  185,  185,  185,  185,
 +       87,  185,  185,  185,  185,  185,  185,  127,  185,  185,
 +      133,  185,  185,  185,  142,  185,  185,   73,  185,  159,
 +      185,  185,  185,  185,  185,  185,   46,  185,   60,   49,
 +
 +      185,  185,  185,  185,   70,  185,  185,  185,  185,  185,
 +      185,  128,  185,  185,  134,  185,  185,  185,  161,  185,
 +      177,  185,  171,  185,  185,  185,  185,  185,   67,   68,
 +      185,  185,  185,  185,  185,  120,  185,  185,  185,  143,
 +      185,  185,  185,  185,  185,  185,  185,  185,  185,  185,
 +      185,  185,  114,  185,  185,  185,  185,  185,  172,  185,
 +      185,   55,   63,   66,  185,  185,  185,  185,  185,  185,
 +      136,  146,  169,  185,  185,  185,  185,  185,  185,  185,
 +      131,  185,  185,   36,  185,  185,  185,  185,  185,  185,
 +      178,  185,  185,  185,  185,  185,  132,  185,   95,   96,
 +
 +       97,  185,  185,  185,  185,  105,   64,    0
 +=======
 +static yyconst flex_int16_t yy_accept[932] =
 +    {   0,
 +        0,    0,  192,  190,    1,    1,  190,    5,  190,    6,
 +      190,  190,  190,  190,  190,  185,   21,    2,  190,   16,
 +      190,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  190,   28,   24,   19,   25,   17,
 +       26,   18,    0,  187,    3,    4,   20,  186,  185,    0,
 +       29,   27,   30,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +
 +      189,  105,  104,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  127,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  171,  172,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,   23,   22,    0,
 +      186,    0,    0,  188,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,   54,   65,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,   74,  189,
 +      189,  189,  189,  189,  189,  189,  189,   92,  189,  189,
 +
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  112,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  153,  189,  189,  189,  189,  189,  159,  189,
 +      189,  189,  189,  179,  189,  189,  189,  189,  189,  189,
 +      189,  189,    0,  187,    0,    0,  186,  189,   32,  189,
 +      189,  189,  189,  189,   37,   39,  189,  189,  189,  189,
 +       62,  189,   47,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,   53,  189,  189,  189,  189,  189,   72,  189,
 +
 +      189,  189,  189,  189,  189,   83,  189,   85,  189,  189,
 +       87,  189,  189,   91,  189,  189,  189,  189,  189,  100,
 +      101,  189,  189,  189,  189,  189,  189,  189,  189,  110,
 +      111,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  144,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  168,  154,  189,  189,  189,  189,  152,  189,  189,
 +      189,  189,  189,  189,  189,  174,  178,  189,  189,  189,
 +      189,  189,  189,  189,   10,   15,    9,    8,  189,   12,
 +       14,    0,  186,   31,  189,   35,  189,  189,  189,   41,
 +
 +      189,   43,  189,  189,  189,  189,  189,  189,  189,   57,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,   80,   82,  189,  189,  189,   86,  189,  189,
 +       90,  189,  189,  189,  189,  189,  189,  103,  189,  189,
 +      108,  189,  189,  189,  113,  189,  189,  189,  189,  189,
 +      121,  189,  124,  189,  189,  189,  128,  189,  129,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  142,
 +      143,  189,  189,  189,  189,  189,  189,  157,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  180,
 +      189,  189,  189,  183,  189,   11,  189,   13,  189,  189,
 +
 +       34,   38,   40,  189,   44,  189,  189,  189,   48,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +       69,   71,  189,  189,   79,  189,   84,  189,  189,  189,
 +      189,  189,  189,   94,  189,  189,  189,  189,  189,  114,
 +      109,  189,  189,  189,  120,  189,  117,  189,  189,  189,
 +      189,  133,  189,  132,  189,  189,  189,  189,  189,  147,
 +      189,  141,  189,  189,  189,  189,  155,  156,  189,  161,
 +      189,  166,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  184,    7,  189,  189,   42,   45,
 +      189,  189,  189,  189,  189,  189,   52,   56,  189,  189,
 +
 +      189,  189,  189,  189,  189,  189,   76,  189,  189,  189,
 +       77,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,  148,  189,
 +      189,  189,  189,  160,  189,  165,  189,  189,  189,  158,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  189,  189,  189,   59,  189,  189,  189,
 +      189,  189,  189,  189,   75,   78,  189,  189,  189,   93,
 +      189,  189,  189,  189,   96,  102,  189,  189,  115,  118,
 +      119,  189,  189,  189,  189,  125,  126,  189,  189,  189,
 +
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  151,
 +      150,  189,  189,  189,  189,  169,  189,  189,  189,  189,
 +      189,  189,  189,   33,  189,  189,  189,  189,   50,  189,
 +      189,  189,  189,  189,  189,  189,  189,  189,   81,  189,
 +      189,  189,  189,  189,   95,  189,  106,  189,  189,  123,
 +      189,  189,  189,  189,  189,  189,  189,  138,  140,  189,
 +      189,  189,  189,  167,  163,  189,  189,  170,  189,  189,
 +      189,  189,  177,  189,  189,  189,   61,  189,   51,   58,
 +      189,  189,  189,  189,  189,  189,  189,   88,  189,  189,
 +      189,  189,  189,  189,  189,  130,  189,  189,  136,  189,
 +
 +      189,  189,  145,  189,  189,   73,  189,  162,  189,  189,
 +      189,  189,  189,  189,   46,  189,   60,   49,  189,  189,
 +      189,  189,   70,  189,  189,  189,  189,  189,  189,  189,
 +      131,  189,  189,  137,  189,  189,  189,  164,  189,  181,
 +      189,  175,  189,  189,  189,  189,  189,   67,   68,  189,
 +      189,  189,  189,  189,  189,  122,  189,  189,  189,  146,
 +      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 +      189,  189,  189,  116,  189,  189,  189,  189,  189,  176,
 +      189,  189,   55,   63,   66,  189,  189,  189,  189,  189,
 +      189,  189,  139,  149,  173,  189,  189,  189,   89,  189,
 +
 +      189,  189,  189,  134,  189,  189,   36,  189,  189,  189,
 +      189,  189,  189,  182,  189,  189,  189,  189,  189,  135,
 +      189,   97,   98,   99,  189,  189,  189,  189,  107,   64,
 +        0
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ static yyconst flex_int16_t yy_accept[1007] =
+     {   0,
+         0,    0,  202,  200,    1,    1,  200,    5,  200,    6,
+       200,  200,  200,  200,  200,  195,   21,    2,  200,   16,
+       200,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  200,   28,   24,   19,   25,   17,
+        26,   18,    0,  197,    3,    4,   20,  196,  195,    0,
+        29,   27,   30,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+ 
+       199,  199,  199,  199,  110,  109,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  134,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  181,  182,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,   23,   22,    0,  196,    0,    0,  198,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,   55,   66,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,   77,  199,  199,  199,  199,
+ 
+       199,  199,  199,  199,   95,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  117,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  163,  199,  199,  199,  199,  199,  169,  199,
+       199,  199,  199,  189,  199,  199,  199,  199,  199,  199,
+       199,  199,    0,  197,    0,    0,  196,  199,   32,  199,
+       199,  199,  199,  199,  199,   38,   40,  199,  199,  199,
+       199,   63,  199,   48,  199,  199,  199,  199,  199,  199,
+ 
+       199,  199,  199,   54,  199,  199,  199,  199,  199,  199,
+        75,  199,  199,  199,  199,  199,  199,   86,  199,   88,
+       199,  199,   90,  199,  199,   94,  199,  199,  199,  199,
+       199,  199,  199,  105,  106,  199,  199,  199,  199,  199,
+       199,  199,  199,  115,  116,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  151,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       178,  164,  199,  199,  199,  199,  162,  199,  199,  199,
+       199,  199,  199,  199,  184,  188,  199,  199,  199,  199,
+ 
+       199,  199,  199,   10,   15,    9,    8,  199,   12,   14,
+         0,  196,   31,  199,  199,   36,  199,  199,  199,   42,
+       199,   44,  199,  199,  199,  199,  199,  199,  199,   58,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,   83,   85,  199,  199,  199,   89,  199,
+       199,   93,  199,  199,  199,  199,  199,  199,  199,  199,
+       108,  199,  199,  113,  199,  199,  199,  118,  199,  199,
+       121,  199,  199,  199,  199,  128,  199,  131,  199,  199,
+       199,  135,  199,  136,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  149,  150,  199,  199,  199,  199,
+ 
+       199,  199,  199,  199,  199,  167,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  190,  199,  199,
+       199,  193,  199,   11,  199,   13,  199,   34,  199,   35,
+        39,   41,  199,   45,  199,  199,  199,   49,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+        72,   74,  199,  199,   82,  199,   87,  199,  199,  199,
+       199,  199,  199,   97,  199,  199,  199,  199,  199,  199,
+       199,  119,  114,  199,  199,  199,  126,  199,  123,  199,
+       199,  199,  199,  199,  140,  199,  139,  199,  199,  199,
+       199,  199,  154,  199,  148,  199,  199,  199,  199,  199,
+ 
+       199,  199,  165,  166,  199,  171,  199,  176,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       194,    7,  199,  199,   43,   46,  199,  199,  199,  199,
+       199,  199,   53,   57,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,   79,  199,  199,  199,   80,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  155,  199,
+       199,  199,  199,  199,  199,  199,  170,  199,  175,  199,
+       199,  199,  168,  199,  199,  199,  199,  199,  199,  199,
+ 
+       199,  199,  199,  199,  199,  199,  199,  199,  199,   60,
+       199,  199,  199,  199,  199,  199,  199,  199,   78,   81,
+       199,  199,  199,   96,  199,  199,  199,  199,  199,  100,
+       199,  107,  199,  199,  120,  124,  125,  199,  127,  199,
+       199,  199,  132,  133,  199,  199,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  158,  199,  199,
+       157,  199,  199,  199,  199,  179,  199,  199,  199,  199,
+       199,  199,  199,   33,  199,  199,  199,  199,   51,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,   84,
+       199,  199,  199,  199,  199,   99,   98,  199,  199,  111,
+ 
+       199,  199,  130,  199,  199,  199,  199,  199,  199,  199,
+       145,  147,  199,  199,  199,  199,  159,  199,  160,  177,
+       173,  199,  199,  180,  199,  199,  199,  199,  187,  199,
+       199,  199,   62,  199,   52,   59,  199,  199,  199,   68,
+       199,  199,  199,  199,   91,  199,  199,  199,  199,  199,
+       199,  199,  199,  137,  199,  199,  143,  199,  199,  199,
+       152,  199,  199,   76,  199,  199,  172,  199,  199,  199,
+       199,  199,  199,   47,  199,   61,   50,  199,  199,  199,
+       199,  199,   73,  199,  199,  199,  199,  199,  199,  199,
+       199,  138,  199,  199,  144,  199,  199,  199,  199,  174,
+ 
+       199,  191,  199,  185,  199,  199,  199,  199,  199,  199,
+        70,   71,  199,  199,  199,  199,  199,  199,  199,  129,
+       199,  199,  199,  153,  199,  161,  199,  199,  199,  199,
+       199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+       122,  199,  199,  199,  199,  199,  186,  199,  199,   56,
+        64,  199,   69,  199,  199,  199,  199,  199,  199,  199,
+       199,  146,  156,  183,  199,  199,  199,  199,   92,  199,
+       199,  199,  199,  199,  141,  199,  199,   37,  199,   67,
+       199,  199,  199,  199,  199,  199,  192,  199,  199,  199,
+       199,  199,  199,  142,  199,  101,  102,  103,  104,  199,
+ 
+       199,  199,  199,  112,   65,    0
++>>>>>>> upstream/2.10.1+dfsg1
      } ;
  
  static yyconst flex_int32_t yy_ec[256] =
@@@ -650,433 -548,237 +771,457 @@@ static yyconst flex_int32_t yy_meta[74
          2,    2,    1
      } ;
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +static yyconst flex_int16_t yy_base[910] =
 +    {   0,
 +        0,    0, 1041, 1042, 1042, 1042, 1019, 1042, 1033, 1042,
 +     1017,   65,   66,   64,   76,   78, 1042, 1042, 1016, 1015,
 +     1014,   49,   49,   56,   67,   68,   81,   50,   80,   97,
 +        0,  974,   97,  108,  966,   61,  107,  965,  118,  125,
 +      158,   62,  970,  978,  956, 1042, 1042, 1042, 1042, 1042,
 +     1042, 1042, 1017,  184, 1042, 1042, 1042,  199,  214,  229,
 +     1042, 1042, 1042,    0,  966,  965,  977,  968,  973,  966,
 +      973,  958,   37,  952,   58,  962,  969,  952,  194,  948,
 +      962,  149,  955,  964,  953,  959,  945,  958,  116,  958,
 +      109,  945,  944,  940,  943,  961,  935,  949,   24,  937,
 +
 +      956,    0,  931,  935,  924,   84,  130,  940,  962,  158,
 +      941,  927,  938,  938,  924,  923,  915,    0,  116,   98,
 +      929,  936,  923,  182,  127,  924,  933,  914,  918,  918,
 +      916,  199,  912,  911,  910,  145,    0,    0,  938,  912,
 +      901,  158,  922,  918,  912,  909,  897, 1042, 1042,  255,
 +      260,  269,  275,  280,  901,  899,  901,  914,  273,  901,
 +      900,  901,  892,  901,  896,  897,  895,  895,  888,  901,
 +       82,  889,  159,  885,  877,  892,    0,  898,  889,  892,
 +      891,  894,  872,  884,  206,  878,  880,  195,    0,  873,
 +      871,  877,  882,  872,  881,    0,  881,  900,  272,  877,
 +
 +      876,  866,  865,  898,  872,  857,  870,  867,  868,  867,
 +      852,  903,  869,  854,  859,  846,  863,  853,  858,  861,
 +      852,  842,  846,  851,  844,  855,  842,  850,  849,  239,
 +      843,  837,  830,  844,  847,  834,  841,  834,  280,  822,
 +      835,  828,  836,  831,  830,  819,  282,  831,  824,  832,
 +      854,  825,  813,  830,  829,  816,  823,  814,  806,  268,
 +      324,  329,  338,  343,  348,  806,    0,  805,  805,  808,
 +      812,  819,    0,  851,  809,  808,  811,  811,    0,  794,
 +        0,  812,  801,  794,  798,  792,  799,  243,  803,  816,
 +        0,  786,  791,  790,  783,  782,    0,  785,  785,  792,
 +
 +      780,  787,  776,    0,  774,    0,  789,  812,  774,    0,
 +      771,  789,  775,  768,  785,    0,    0,  774,  765,  790,
 +      765,  763,  763,  760,  767,    0,    0,  811,  240,  759,
 +      799,  763,  755,  771,  754,  758,  755,  759,  762,  757,
 +      746,  747,  744,  261,    0,  750,  744,  747,  756,  741,
 +      740,  737,  751,  750,  748,  744,  734,    0,    0,  731,
 +      732,  242,  735,    0,  199,  738,  729,  740,  743,  738,
 +      754,    0,    0,  765,  716,  728,  720,  731,  729,  723,
 +        0,    0,  723,    0,  728,  721,    0,  353,  358,    0,
 +      743,  732,  711,  715,  714,    0,  713,    0,  708,  715,
 +
 +      712,  719,  716,  715,  705,  723,  704,  711,  695,  705,
 +      698,  707,  706,  705,  704,  703,  258,  690,    0,    0,
 +      702,  687,  700,    0,  680,    0,  693,  290,  680,  683,
 +      688,  684,    0,  706,  678,    0,  677,  686,  675,    0,
 +      691,  682,  666,  678,  674,    0,  685,    0,  681,  681,
 +      681,    0,  670,    0,  688,  675,  663,  677,  660,  672,
 +      675,  662,  656,  668,    0,    0,  685,  670,  666,  661,
 +      663,  662,    0,  647,  646,  649,  650,  657,  273,  658,
 +      641,  645,  639,    0,  669,  209,  647,    0,  650,    0,
 +      647,    0,  648,  643,    0,    0,  683,  645,    0,  636,
 +
 +      637,  628,    0,  633,  634,  643,  638,  619,  628,  627,
 +      620,  643,  351,  620,    0,    0,  325,  627,    0,  626,
 +        0,  629,  624,  618,  288,  655,    0,  621,  609,  621,
 +      637,  621,    0,    0,  620,  611,  598,    0,  615,    0,
 +      645,  601,  610,  617,    0,  602,    0,  607,  344,  606,
 +      626,  594,    0,  607,    0,  610,  597,  604,  603,    0,
 +        0,  601,    0,    0,  602,  599,  603,  592,  597,  584,
 +      596,  580,  593,  340,  596,  583,    0,    0,  577,  575,
 +        0,    0,  586,  599,  586,  587,  575,  586,    0,    0,
 +      583,  585,  576,  570,  569,  562,  562,  579,    0,  561,
 +
 +      575,  576,    0,  558,  562,  589,  584,  577,  558,  565,
 +      545,  581,  564,  547,  555,  559,  549,  559,  544,  557,
 +      548,  550,  357,  556,  543,  534,  549,  548,    0,  534,
 +      544,  533,  532,    0,    0,  539,  528,  545,    0,  521,
 +      539,  526,  530,  521,  527,  520,  533,  529,  528,  558,
 +      520,  516,  527,  524,  519,    0,  510,  514,  512,  513,
 +      513,  507,  504,    0,    0,  509,  502,    0,  530,  529,
 +      540,  510,    0,    0,  540,  496,    0,    0,    0,  497,
 +      494,  503,    0,    0,  506,  506,  507,  494,  494,  487,
 +      500,  499,  485,  514,  482,  495,    0,    0,  476,  489,
 +
 +      494,    0,  485,   40,   45,   99,  120,  134,  193,    0,
 +      183,  172,  250,  273,    0,  263,  297,  298,  322,  323,
 +      320,  337,  332,  337,    0,  325,  351,  354,  365,    0,
 +      355,    0,  343,  345,  354,  342,  356,  351,  374,  357,
 +      360,    0,    0,  358,  362,  381,  365,    0,  350,  367,
 +        0,  371,  357,  372,  358,    0,  364,  364,  357,    0,
 +      363,    0,    0,  364,  365,  373,  366,  381,  375,  385,
 +        0,  390,  391,  392,  409,  375,  381,    0,  391,  400,
 +        0,  393,  388,  383,    0,  383,  401,    0,  398,    0,
 +      384,  381,  411,  402,  395,  390,    0,  391,    0,    0,
 +
 +      397,  411,  396,  407,    0,  418,  419,  420,  428,  411,
 +      407,    0,  417,  401,    0,  423,  417,  402,    0,  408,
 +        0,  411,    0,  411,  422,  423,  426,  421,    0,    0,
 +      455,  456,  457,  449,  427,    0,  423,  444,  431,    0,
 +      438,  439,  436,  427,  433,  445,  425,  431,  458,  459,
 +      460,  454,    0,  436,  451,  439,  441,  441,    0,  459,
 +      448,    0,  473,    0,  469,  470,  472,  473,  450,  452,
 +        0,    0,    0,  457,  453,  458,  489,  490,  491,  498,
 +        0,  458,  459,    0,  496,  490,  491,  492,  500,  466,
 +        0,  471,  497,  498,  499,  509,    0,  479,    0,    0,
 +
 +        0,  503,  487,  513,  476,    0,    0, 1042,  540
 +    } ;
 +
 +static yyconst flex_int16_t yy_def[910] =
 +    {   0,
 +      908,    1,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  908,  908,  908,
 +      908,  908,  908,  908,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      908,  908,  908,  908,  908,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  908,  908,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
 +
 +      909,  909,  909,  909,  909,  909,  909,    0,  908
 +    } ;
 +
 +static yyconst flex_int16_t yy_nxt[1116] =
 +=======
 +static yyconst flex_int16_t yy_base[933] =
++=======
+ static yyconst flex_int16_t yy_base[1008] =
++>>>>>>> upstream/2.10.1+dfsg1
      {   0,
-         0,    0, 1064, 1065, 1065, 1065, 1042, 1065, 1056, 1065,
-      1040,   65,   66,   64,   76,   78, 1065, 1065, 1039, 1038,
-      1037,   49,   49,   56,   67,   68,   81,   50,   80,   97,
-         0,  997,   97,  108,  989,   61,  107,  988,  118,  125,
-       158,   62,  993, 1001,  979, 1065, 1065, 1065, 1065, 1065,
-      1065, 1065, 1040,  184, 1065, 1065, 1065,  199,  214,  229,
-      1065, 1065, 1065,    0,  989,  988, 1000,  991,  996,  989,
-       996,  981,   37,  975,   58,  985,  992,  975,  194,  971,
-       985,  149,  978,  987,  976,  982,  968,  981,  116,  981,
-       202,  968,  967,  963,  966,  984,  958,  972,   24,  960,
- 
-       979,    0,  954,  958,  947,   84,   96,  963,  985,  158,
-       964,  950,  961,  961,  947,  946,  938,    0,  116,  137,
-       952,  959,  946,  182,  138,  947,  956,  937,  941,  941,
-       939,  203,  935,  934,  933,  149,    0,    0,  961,  935,
-       924,  167,  945,  941,  935,  932,  920, 1065, 1065,  260,
-       265,  274,  280,  285,  924,  922,  924,  937,  222,  924,
-       923,  924,  915,  924,  919,  920,  918,  918,  911,  924,
-        82,  912,  105,  908,  900,  915,    0,  921,  912,  915,
-       914,  917,  895,  907,  193,  901,  903,  220,    0,  896,
-       894,  900,  905,  905,  915,  893,  902,    0,  902,  921,
- 
-       193,  898,  897,  887,  886,  919,  893,  878,  891,  888,
-       889,  888,  873,  924,  890,  875,  880,  867,  884,  874,
-       879,  882,  873,  863,  867,  872,  865,  876,  863,  871,
-       870,  204,  864,  858,  851,  865,  868,  855,  862,  855,
-       278,  843,  856,  849,  857,  852,  851,  840,  280,  852,
-       845,  853,  875,  846,  834,  851,  850,  837,  844,  835,
-       827,  261,  317,  322,  331,  336,  341,  827,    0,  826,
-       826,  829,  833,  840,    0,  872,  830,  829,  832,  832,
-         0,  815,    0,  833,  822,  815,  819,  813,  820,  246,
-       824,  837,    0,  807,  812,  811,  804,  803,    0,  806,
- 
-       806,  813,  801,  808,  797,    0,  795,    0,  810,  833,
-         0,  807,  794,    0,  791,  809,  795,  788,  805,    0,
-         0,  794,  785,  810,  785,  783,  783,  780,  787,    0,
-         0,  831,  269,  779,  819,  783,  775,  791,  774,  778,
-       775,  779,  782,  777,  766,  767,  764,  300,    0,  770,
-       764,  767,  776,  761,  760,  757,  771,  770,  768,  764,
-       754,    0,    0,  751,  752,  246,  755,    0,  312,  758,
-       749,  760,  763,  758,  774,    0,    0,  785,  736,  748,
-       740,  751,  749,  743,    0,    0,  743,    0,  748,  741,
-         0,  348,  359,    0,  763,  752,  731,  735,  734,    0,
- 
-       733,    0,  728,  735,  732,  739,  736,  735,  725,  743,
-       724,  731,  715,  725,  718,  727,  726,  725,  724,  723,
-       256,  710,    0,    0,  722,  707,  720,    0,  700,  711,
-         0,  712,  278,  699,  702,  707,  703,    0,  725,  697,
-         0,  696,  705,  694,    0,  710,  701,  685,  697,  693,
-         0,  704,    0,  700,  700,  700,    0,  689,    0,  707,
-       694,  682,  696,  679,  691,  694,  681,  675,  687,    0,
-         0,  704,  689,  685,  680,  682,  681,    0,  666,  665,
-       669,  667,  668,  675,  128,  676,  659,  663,  657,    0,
-       687,  324,  665,    0,  668,    0,  665,    0,  666,  661,
- 
-         0,    0,  701,  663,    0,  654,  655,  646,    0,  651,
-       652,  661,  656,  637,  646,  645,  638,  661,  343,  638,
-         0,    0,  272,  645,    0,  644,    0,  647,  642,  649,
-       635,  347,  672,    0,  638,  626,  638,  654,  638,    0,
-         0,  637,  628,  615,    0,  632,    0,  346,  619,  628,
-       635,    0,  620,    0,  625,  325,  624,  644,  612,    0,
-       625,    0,  628,  615,  622,  621,    0,    0,  619,    0,
-       615,    0,  619,  616,  620,  609,  614,  601,  613,  597,
-       610,  341,  613,  600,    0,    0,  594,  592,    0,    0,
-       603,  616,  603,  604,  592,  603,    0,    0,  600,  602,
- 
-       593,  587,  586,  579,  579,  596,    0,  578,  592,  593,
-         0,  575,  573,  578,  605,  600,  593,  574,  581,  561,
-       597,  580,  563,  571,  575,  565,  575,  557,  559,  572,
-       563,  565,  362,  571,  558,  549,  564,  563,    0,  549,
-       559,  548,  547,    0,  560,    0,  553,  542,  559,    0,
-       535,  553,  540,  544,  535,  541,  534,  547,  543,  542,
-       572,  534,  530,  541,  538,  533,    0,  524,  528,  526,
-       527,  527,  521,  518,    0,    0,  523,  516,  525,    0,
-       543,  542,  553,  523,    0,    0,  553,  509,    0,    0,
-         0,  510,  507,  512,  515,    0,    0,  518,  518,  519,
- 
-       506,  506,   30,   54,   95,  111,  159,  191,  216,    0,
-         0,  275,  273,  331,  339,    0,  332,  335,  331,  345,
-       338,  343,  371,    0,  362,  339,  342,  346,    0,  334,
-       354,  355,  348,  348,  346,  363,  358,  363,    0,  351,
-       349,  378,  379,  390,    0,  379,    0,  367,  368,    0,
-       375,  362,  377,  371,  394,  377,  380,    0,    0,  378,
-       382,  401,  385,    0,    0,  369,  386,    0,  390,  376,
-       390,  376,    0,  382,  382,  375,    0,  381,    0,    0,
-       382,  383,  391,  384,  399,  392,  402,    0,  403,  409,
-       410,  411,  428,  394,  400,    0,  410,  419,    0,  412,
- 
-       407,  402,    0,  402,  420,    0,  417,    0,  403,  400,
-       430,  421,  414,  409,    0,  410,    0,    0,  416,  430,
-       415,  426,    0,  443,  438,  439,  440,  448,  431,  428,
-         0,  437,  421,    0,  443,  437,  422,    0,  428,    0,
-       431,    0,  432,  442,  443,  446,  441,    0,    0,  454,
-       476,  477,  478,  470,  448,    0,  444,  465,  452,    0,
-       459,  460,  457,  448,  454,  466,  446,  452,  453,  480,
-       481,  482,  476,    0,  458,  473,  461,  463,  463,    0,
-       481,  470,    0,  495,    0,  477,  493,  494,  495,  496,
-       473,  475,    0,    0,    0,  480,  476,  481,    0,  512,
- 
-       513,  514,  521,    0,  481,  482,    0,  519,  513,  514,
-       515,  523,  489,    0,  494,  520,  521,  522,  532,    0,
-       502,    0,    0,    0,  526,  510,  536,  499,    0,    0,
-      1065,  563
+         0,    0, 1139, 1140, 1140, 1140, 1117, 1140, 1131, 1140,
+      1115,   65,   66,   64,   76,   78, 1140, 1140, 1114, 1113,
+      1112,   49,   49,   56,   69,   64,   79,   84,   83,   96,
+         0, 1072,   99,  110,   74,   93,  111, 1064,  113,  126,
+       168,   85, 1069, 1077, 1055, 1140, 1140, 1140, 1140, 1140,
+      1140, 1140, 1116,  187, 1140, 1140, 1140,  192,  210,  232,
+      1140, 1140, 1140,    0, 1065, 1064, 1076, 1070, 1066, 1071,
+      1064, 1071, 1056,   37, 1050,  121, 1060, 1067, 1050,  195,
+      1046, 1060, 1047,  137, 1052, 1061, 1050, 1056, 1042, 1055,
+       156, 1055,  203, 1042, 1041, 1037, 1040, 1058, 1032, 1032,
+ 
+      1045,   24, 1033, 1052,    0, 1027, 1031, 1020,  126,  108,
+      1036, 1058, 1038,  105, 1036, 1017, 1021, 1032, 1032, 1018,
+      1017, 1009,    0,  129,  155, 1023, 1030, 1017,  214,  164,
+      1018, 1027, 1008, 1012, 1012, 1010,  210, 1006, 1005, 1004,
+       174,    0,    0, 1032, 1006,  995,  177, 1016, 1012, 1006,
+      1003,  991, 1140, 1140,  274,  279,  288,  262,  294,  995,
+       993,  995, 1000, 1007,  210,  994,  993,  994,  985,  994,
+       989,  990,  988,  988,  981,  994,  260,  982,   67,  978,
+       970,  985,    0,  991,  974,  981,  984,  983,  986,  964,
+       976,  238,  970,  972,  193,    0,  965,  963,  969,  974,
+ 
+       974,  984,  962,  971,    0,  971,  990,  286,  964,  966,
+       965,  955,  954,  987,  961,  946,  959,  956,  957,  956,
+       941,  992,  958,  940,  942,  947,  934,  965,  950,  940,
+       945,  948,  939,  929,  933,  938,  931,  942,  929,  937,
+       936,  253,  930,  924,  917,  931,  934,  921,  928,  921,
+       298,  909,  922,  915,  923,  918,  917,  906,  300,  918,
+       911,  919,  941,  912,  900,  917,  916,  903,  910,  901,
+       893,  279,  302,  335,  344,  349,  354,  893,    0,  892,
+       897,  891,  894,  898,  905,    0,  937,  895,  894,  897,
+       897,    0,  880,    0,  898,  887,  880,  884,  878,  885,
+ 
+       284,  889,  902,    0,  872,  885,  876,  875,  868,  867,
+         0,  870,  870,  877,  865,  872,  861,    0,  859,    0,
+       874,  897,    0,  871,  858,    0,  855,  873,  859,  851,
+       851,  868,  888,    0,    0,  856,  847,  872,  847,  845,
+       845,  842,  849,    0,    0,  893,  230,  844,  840,  880,
+       844,  840,  835,  851,  834,  838,  835,  839,  842,  837,
+       826,  827,  824,  258,    0,  830,  824,  827,  836,  821,
+       820,  817,  831,  830,  828,  824,  811,  813,  828,  809,
+         0,    0,  808,  809,  312,  812,    0,  325,  815,  806,
+       817,  820,  815,  831,    0,    0,  842,  793,  805,  797,
+ 
+       808,  806,  800,    0,    0,  800,    0,  805,  798,    0,
+       372,  377,    0,  820,  802,  808,  787,  791,  790,    0,
+       789,    0,  784,  791,  788,  795,  792,  791,  781,  799,
+       780,  787,  771,  781,  774,  783,  774,  781,  780,  779,
+       778,  220,  765,    0,    0,  777,  762,  775,    0,  755,
+       766,    0,  767,  339,  754,  762,  756,  761,  748,  756,
+         0,  778,  750,    0,  749,  758,  747,    0,  763,  754,
+         0,  738,  750,  746,  755,    0,  756,    0,  752,  752,
+       752,    0,  741,    0,  759,  746,  734,  748,  731,  743,
+       746,  733,  727,  739,    0,    0,  756,  741,  729,  736,
+ 
+       722,  721,  729,  731,  730,    0,  715,  714,  718,  716,
+       717,  724,  178,  725,  708,  712,  706,    0,  736,  157,
+       714,    0,  717,    0,  714,    0,  715,    0,  710,    0,
+         0,  750,  712,    0,  703,  704,  695,    0,  700,  701,
+       710,  705,  686,  695,  694,  687,  710,  685,  370,  686,
+         0,    0,  323,  693,    0,  692,    0,  695,  690,  697,
+       683,  373,  720,    0,  693,  685,  673,  687,  684,  700,
+       684,    0,    0,  683,  674,  661,    0,  678,    0,  679,
+       358,  664,  673,  680,    0,  665,    0,  670,  349,  669,
+       689,  657,    0,  670,    0,  673,  660,  670,  666,  651,
+ 
+       660,  663,    0,    0,  661,    0,  657,    0,  661,  658,
+       662,  651,  656,  643,  655,  639,  652,  358,  655,  642,
+         0,    0,  636,  634,    0,    0,  645,  658,  645,  646,
+       634,  645,    0,    0,  642,  644,  635,  629,  663,  627,
+       620,  620,  637,    0,  619,  633,  634,    0,  616,  614,
+       619,  646,  641,  634,  623,  614,  621,  622,  600,  636,
+       619,  602,  610,  614,  604,  606,  613,  595,  597,  610,
+       601,  603,  376,  609,  596,  587,  602,  601,    0,  587,
+       597,  598,  585,  592,  587,  582,    0,  595,    0,  588,
+       577,  594,    0,  570,   33,   32,   47,   75,   92,  132,
+ 
+       165,  183,  226,  275,  265,  269,  294,  301,  298,    0,
+       310,  321,  338,  345,  343,  349,  345,  344,    0,    0,
+       353,  349,  360,    0,  381,  382,  395,  358,  369,    0,
+       358,    0,  403,  362,    0,    0,    0,  365,    0,  364,
+       371,  376,    0,    0,  381,  383,  386,  376,  378,  373,
+       388,  390,  378,  409,  379,  394,  383,    0,  382,  395,
+         0,  398,  381,  396,  403,    0,  396,  399,  395,  409,
+       402,  407,  435,    0,  424,  401,  404,  408,    0,  394,
+       414,  415,  408,  408,  406,  406,  423,  417,  422,    0,
+       410,  408,  437,  438,  449,    0,    0,  414,  439,    0,
+ 
+       426,  427,    0,  434,  421,  435,  429,  452,  435,  438,
+         0,    0,  436,  440,  459,  443,    0,  439,    0,    0,
+         0,  428,  445,    0,  449,  435,  449,  435,    0,  441,
+       441,  434,    0,  440,    0,    0,  441,  442,  450,  457,
+       444,  459,  453,  463,    0,  463,  469,  470,  471,  471,
+       489,  455,  461,    0,  471,  480,    0,  473,  468,  463,
+         0,  463,  481,    0,  469,  479,    0,  465,  462,  492,
+       483,  476,  471,    0,  472,    0,    0,  478,  490,  493,
+       478,  489,    0,  506,  501,  502,  503,  500,  513,  496,
+       492,    0,  501,  485,    0,  507,  501,  486,  499,    0,
+ 
+       494,    0,  497,    0,  497,  507,  508,  511,  500,  507,
+         0,    0,  520,  542,  543,  544,  514,  537,  515,    0,
+       511,  532,  519,    0,  526,    0,  527,  524,  515,  521,
+       533,  513,  524,  520,  521,  548,  549,  550,  539,  545,
+         0,  527,  542,  530,  532,  532,    0,  550,  539,    0,
+       565,  538,    0,  548,  563,  564,  565,  571,  567,  544,
+       546,    0,    0,    0,  551,  547,  552,  543,    0,  584,
+       585,  586,  570,  594,    0,  554,  555,    0,  592,    0,
+       586,  587,  588,  567,  597,  563,    0,  568,  594,  595,
+       596,  581,  607,    0,  577,    0,    0,    0,    0,  601,
+ 
+       585,  611,  574,    0,    0, 1140,  638
      } ;
  
- static yyconst flex_int16_t yy_def[933] =
+ static yyconst flex_int16_t yy_def[1008] =
      {   0,
-       931,    1,  931,  931,  931,  931,  931,  931,  931,  931,
-       931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
-       931,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  931,  931,  931,  931,  931,  931,
-       931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
-       931,  931,  931,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  931,  931,  931,
-       931,  931,  931,  931,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  931,  931,  931,  931,  931,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  931,  931,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
- 
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-       932,  932,  932,  932,  932,  932,  932,  932,  932,  932,
-         0,  931
+      1006,    1, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1006, 1006, 1006, 1006, 1006, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1006, 1006, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+      1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007,
+ 
+      1007, 1007, 1007, 1007, 1007,    0, 1006
      } ;
  
++<<<<<<< HEAD
 +static yyconst flex_int16_t yy_nxt[1139] =
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ static yyconst flex_int16_t yy_nxt[1214] =
++>>>>>>> upstream/2.10.1+dfsg1
      {   0,
          4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
         14,   15,   16,   16,   16,   16,   16,   17,   18,   19,
@@@ -1086,247 -788,135 +1231,379 @@@
         31,   31,   31,   31,   31,   31,   31,   31,   31,   44,
         31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
         31,   31,   45,   49,   53,   51,   54,   54,   54,   54,
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +       54,  201,  202,   55,   96,   50,   52,   56,   58,   72,
 +       59,   59,   59,   59,   59,  752,   57,   65,   66,   67,
 +
 +       73,   97,  163,   75,   60,  753,   68,   76,  164,   74,
 +       77,   78,   69,   70,   71,  166,   79,   80,   82,   81,
 +      113,  144,   83,  167,  114,   85,  145,   86,   90,   60,
 +       84,   87,  101,  284,   88,   98,   91,   89,   92,   93,
 +       99,   94,  285,  208,  105,  109,  754,   95,  106,  102,
 +      100,  209,  107,  225,  115,  226,  103,  108,  116,  110,
 +      192,  117,  118,  223,  119,  123,  193,  120,  111,  124,
 +      121,  188,  137,  138,  127,  755,  128,  189,  125,  129,
 +      130,  190,  224,  131,  126,  756,  132,  133,  139,  210,
 +      134,  135,  235,  236,  211,  136,   54,   54,   54,   54,
 +
 +       54,  179,  180,  249,  250,  140,  181,  287,  254,  141,
 +      150,  151,  151,  151,  151,  151,  214,  757,  142,  758,
 +      288,  143,  215,  255,   58,  152,   59,   59,   59,   59,
 +       59,  230,  759,  299,  231,  150,  300,  153,  153,  232,
 +       60,  154,  154,  154,  154,  154,  475,  233,  171,  234,
 +      152,  172,  173,  243,  174,  175,  244,  476,  176,  303,
 +      304,  574,  245,  261,  261,   60,  575,  262,  262,  262,
 +      262,  262,  151,  151,  151,  151,  151,  264,  264,  441,
 +      442,  265,  265,  265,  265,  265,  263,  154,  154,  154,
 +      154,  154,  154,  154,  154,  154,  154,  270,  313,  346,
 +
 +      408,  472,  457,  409,  356,  347,  365,  473,  760,  366,
 +      606,  263,  314,  271,  272,  315,  357,  381,  607,  367,
 +      382,  368,  517,  518,  525,  383,  457,  526,  761,  384,
 +      567,  385,  386,  762,  568,  387,  262,  262,  262,  262,
 +      262,  262,  262,  262,  262,  262,  388,  388,  763,  764,
 +      389,  389,  389,  389,  389,  265,  265,  265,  265,  265,
 +      265,  265,  265,  265,  265,  389,  389,  389,  389,  389,
 +      389,  389,  389,  389,  389,  595,  599,  624,  644,  686,
 +      600,  765,  687,  766,  767,  768,  596,  769,  770,  771,
 +      772,  597,  688,  773,  774,  645,  775,  689,  776,  625,
 +
 +      777,  624,  644,  778,  686,  779,  780,  687,  781,  782,
 +      783,  784,  785,  786,  787,  788,  688,  789,  790,  791,
 +      792,  689,  793,  794,  795,  796,  797,  798,  799,  800,
 +      801,  802,  803,  782,  804,  805,  806,  807,  808,  809,
 +      810,  811,  812,  813,  814,  815,  816,  817,  818,  819,
 +      820,  821,  822,  823,  824,  825,  826,  827,  828,  829,
 +      830,  831,  832,  833,  834,  835,  836,  813,  837,  838,
 +      839,  840,  841,  842,  843,  844,  822,  845,  846,  847,
 +      848,  849,  850,  851,  852,  853,  854,  855,  856,  857,
 +      858,  859,  860,  861,  862,  863,  864,  865,  866,  867,
 +
 +      868,  869,  870,  871,  872,  873,  874,  875,  876,  877,
 +      878,  855,  879,  880,  881,  882,  883,  884,  885,  886,
 +      887,  888,  889,  890,  891,  892,  893,  894,  895,  896,
 +      897,  898,  899,  900,  901,  902,  903,  904,  905,  906,
 +      907,   64,  751,  750,  749,  748,  747,  746,  745,  744,
 +      743,  742,  741,  740,  739,  738,  737,  736,  735,  734,
 +      733,  732,  731,  730,  729,  728,  727,  726,  725,  724,
 +      723,  722,  721,  720,  719,  718,  717,  716,  715,  714,
 +      713,  712,  711,  710,  709,  708,  707,  706,  705,  704,
 +      703,  702,  701,  700,  699,  698,  697,  696,  695,  694,
 +
 +      693,  692,  691,  690,  685,  684,  683,  682,  681,  680,
 +      679,  678,  677,  676,  675,  674,  673,  672,  671,  670,
 +      669,  668,  667,  666,  665,  664,  663,  662,  661,  660,
 +      659,  658,  657,  656,  655,  654,  653,  652,  651,  650,
 +      649,  648,  647,  646,  643,  642,  641,  640,  639,  638,
 +      637,  636,  635,  634,  633,  632,  631,  630,  629,  628,
 +      627,  626,  623,  622,  621,  620,  619,  618,  617,  616,
 +      615,  614,  613,  612,  611,  610,  609,  608,  605,  604,
 +      603,  602,  601,  598,  594,  593,  592,  591,  590,  589,
 +      588,  587,  586,  585,  584,  583,  582,  581,  580,  579,
 +
 +      578,  577,  576,  573,  572,  571,  570,  569,  566,  565,
 +      564,  563,  562,  561,  560,  559,  558,  557,  556,  555,
 +      554,  553,  552,  551,  550,  549,  548,  547,  546,  545,
 +      544,  543,  542,  541,  540,  539,  538,  537,  536,  535,
 +      534,  533,  532,  531,  530,  529,  528,  527,  524,  523,
 +      522,  521,  520,  519,  516,  515,  514,  513,  512,  511,
 +      510,  509,  508,  507,  506,  505,  504,  503,  502,  501,
 +      500,  499,  498,  497,  496,  495,  494,  493,  492,  491,
 +      490,  489,  488,  487,  486,  485,  484,  483,  482,  481,
 +      480,  479,  478,  477,  474,  471,  470,  469,  468,  467,
 +
 +      466,  465,  464,  463,  462,  461,  460,  459,  458,  456,
 +      455,  454,  453,  452,  451,  450,  449,  448,  447,  446,
 +      445,  444,  443,  440,  439,  438,  437,  436,  435,  434,
 +      433,  432,  431,  430,  429,  428,  427,  426,  425,  424,
 +      423,  422,  421,  420,  419,  418,  417,  416,  415,  414,
 +      413,  412,  411,  410,  407,  406,  405,  404,  403,  402,
 +      401,  400,  399,  398,  397,  396,  395,  394,  393,  392,
 +      391,  390,  380,  379,  378,  377,  376,  375,  374,  373,
 +      372,  371,  370,  369,  364,  363,  362,  361,  360,  359,
 +      358,  355,  354,  353,  352,  351,  350,  349,  348,  345,
 +
 +      344,  343,  342,  341,  340,  339,  338,  337,  336,  335,
 +      334,  333,  332,  331,  330,  329,  328,  327,  326,  325,
 +      324,  323,  322,  321,  320,  319,  318,  317,  316,  312,
 +      311,  310,  309,  308,  307,  306,  305,  302,  301,  298,
 +      297,  296,  295,  294,  293,  292,  291,  290,  289,  286,
 +      283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
 +      273,  269,  268,  267,  266,  260,  259,  258,  257,  256,
 +      253,  252,  251,  248,  247,  246,  242,  241,  240,  239,
 +      238,  237,  229,  228,  227,  222,  221,  220,  219,  218,
 +      217,  216,  213,  212,  207,  206,  205,  204,  203,  200,
 +
 +      199,  198,  197,  196,  195,  194,  191,  187,  186,  185,
 +      184,  183,  182,  178,  177,  170,  169,  168,  165,  162,
 +      161,  160,  159,  158,  157,  156,  155,  149,  148,  147,
 +      146,  122,  112,  104,   63,   62,   61,   48,   47,   46,
 +      908,    3,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908
 +    } ;
 +
 +static yyconst flex_int16_t yy_chk[1116] =
 +=======
 +       54,  203,  204,   55,   96,   50,   52,   56,   58,   72,
 +       59,   59,   59,   59,   59,  757,   57,   65,   66,   67,
 +
 +       73,   97,  163,   75,   60,  758,   68,   76,  164,   74,
 +       77,   78,   69,   70,   71,  166,   79,   80,   82,   81,
 +      113,  144,   83,  167,  114,   85,  145,   86,   90,   60,
 +       84,   87,  101,  286,   88,   98,   91,   89,   92,   93,
 +       99,   94,  287,  210,  105,  109,  759,   95,  106,  102,
 +      100,  211,  107,  289,  115,  212,  103,  108,  116,  110,
 +      213,  117,  118,  225,  119,  123,  290,  120,  111,  124,
 +      121,  188,  137,  138,  127,  760,  128,  189,  125,  129,
 +      130,  190,  226,  131,  126,  575,  132,  133,  139,  576,
 +      134,  135,  227,  761,  228,  136,   54,   54,   54,   54,
 +
 +       54,  179,  180,  237,  238,  140,  181,  251,  252,  141,
 +      150,  151,  151,  151,  151,  151,  216,  256,  142,  317,
 +      301,  143,  217,  302,   58,  152,   59,   59,   59,   59,
 +       59,  232,  257,  318,  233,  150,  319,  153,  153,  234,
 +       60,  154,  154,  154,  154,  154,  272,  235,  171,  236,
 +      152,  172,  173,  192,  174,  175,  762,  245,  176,  193,
 +      246,  194,  273,  274,  350,   60,  247,  763,  263,  263,
 +      351,  195,  264,  264,  264,  264,  264,  151,  151,  151,
 +      151,  151,  266,  266,  305,  306,  267,  267,  267,  267,
 +      267,  265,  154,  154,  154,  154,  154,  154,  154,  154,
 +
 +      154,  154,  360,  412,  369,  477,  413,  370,  446,  447,
 +      385,  478,  532,  386,  361,  533,  265,  371,  387,  372,
 +      523,  524,  388,  607,  389,  390,  764,  608,  391,  264,
 +      264,  264,  264,  264,  264,  264,  264,  264,  264,  392,
 +      392,  462,  765,  393,  393,  393,  393,  393,  267,  267,
 +      267,  267,  267,  267,  267,  267,  267,  267,  634,  480,
 +      393,  393,  393,  393,  393,  462,  481,  603,  627,  615,
 +      482,  393,  393,  393,  393,  393,  582,  616,  604,  655,
 +      635,  583,  634,  605,  699,  628,  766,  700,  767,  768,
 +      769,  770,  771,  772,  773,  774,  656,  701,  775,  776,
 +
 +      777,  778,  702,  655,  779,  780,  781,  782,  783,  699,
 +      784,  785,  700,  786,  787,  788,  789,  790,  791,  792,
 +      793,  701,  794,  795,  796,  797,  702,  798,  799,  800,
 +      801,  802,  803,  804,  805,  806,  807,  808,  809,  810,
 +      811,  812,  813,  814,  815,  816,  817,  818,  819,  820,
 +      821,  822,  823,  800,  824,  825,  826,  827,  828,  829,
 +      830,  831,  832,  833,  834,  835,  836,  837,  838,  839,
 +      840,  841,  842,  843,  844,  845,  846,  847,  848,  849,
 +      850,  851,  852,  853,  854,  855,  832,  856,  857,  858,
 +      859,  860,  861,  862,  863,  841,  864,  865,  866,  867,
 +
 +      868,  869,  870,  871,  872,  873,  874,  875,  876,  877,
 +      878,  879,  880,  881,  882,  883,  884,  885,  886,  887,
 +      888,  889,  890,  891,  892,  893,  894,  895,  896,  897,
 +      898,  899,  876,  900,  901,  902,  903,  904,  905,  906,
 +      907,  908,  909,  910,  911,  912,  913,  914,  915,  916,
 +      917,  918,  919,  920,  921,  922,  923,  924,  925,  926,
 +      927,  928,  929,  930,   64,  756,  755,  754,  753,  752,
 +      751,  750,  749,  748,  747,  746,  745,  744,  743,  742,
 +      741,  740,  739,  738,  737,  736,  735,  734,  733,  732,
 +      731,  730,  729,  728,  727,  726,  725,  724,  723,  722,
 +
 +      721,  720,  719,  718,  717,  716,  715,  714,  713,  712,
 +      711,  710,  709,  708,  707,  706,  705,  704,  703,  698,
 +      697,  696,  695,  694,  693,  692,  691,  690,  689,  688,
 +      687,  686,  685,  684,  683,  682,  681,  680,  679,  678,
 +      677,  676,  675,  674,  673,  672,  671,  670,  669,  668,
 +      667,  666,  665,  664,  663,  662,  661,  660,  659,  658,
 +      657,  654,  653,  652,  651,  650,  649,  648,  647,  646,
 +      645,  644,  643,  642,  641,  640,  639,  638,  637,  636,
 +      633,  632,  631,  630,  629,  626,  625,  624,  623,  622,
 +      621,  620,  619,  618,  617,  614,  613,  612,  611,  610,
 +
 +      609,  606,  602,  601,  600,  599,  598,  597,  596,  595,
 +      594,  593,  592,  591,  590,  589,  588,  587,  586,  585,
 +      584,  581,  580,  579,  578,  577,  574,  573,  572,  571,
 +      570,  569,  568,  567,  566,  565,  564,  563,  562,  561,
 +      560,  559,  558,  557,  556,  555,  554,  553,  552,  551,
 +      550,  549,  548,  547,  546,  545,  544,  543,  542,  541,
 +      540,  539,  538,  537,  536,  535,  534,  531,  530,  529,
 +      528,  527,  526,  525,  522,  521,  520,  519,  518,  517,
 +      516,  515,  514,  513,  512,  511,  510,  509,  508,  507,
 +      506,  505,  504,  503,  502,  501,  500,  499,  498,  497,
 +
 +      496,  495,  494,  493,  492,  491,  490,  489,  488,  487,
 +      486,  485,  484,  483,  479,  476,  475,  474,  473,  472,
 +      471,  470,  469,  468,  467,  466,  465,  464,  463,  461,
 +      460,  459,  458,  457,  456,  455,  454,  453,  452,  451,
 +      450,  449,  448,  445,  444,  443,  442,  441,  440,  439,
 +      438,  437,  436,  435,  434,  433,  432,  431,  430,  429,
 +      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
 +      418,  417,  416,  415,  414,  411,  410,  409,  408,  407,
 +      406,  405,  404,  403,  402,  401,  400,  399,  398,  397,
 +      396,  395,  394,  384,  383,  382,  381,  380,  379,  378,
 +
 +      377,  376,  375,  374,  373,  368,  367,  366,  365,  364,
 +      363,  362,  359,  358,  357,  356,  355,  354,  353,  352,
 +      349,  348,  347,  346,  345,  344,  343,  342,  341,  340,
 +      339,  338,  337,  336,  335,  334,  333,  332,  331,  330,
 +      329,  328,  327,  326,  325,  324,  323,  322,  321,  320,
 +      316,  315,  314,  313,  312,  311,  310,  309,  308,  307,
 +      304,  303,  300,  299,  298,  297,  296,  295,  294,  293,
 +      292,  291,  288,  285,  284,  283,  282,  281,  280,  279,
 +      278,  277,  276,  275,  271,  270,  269,  268,  262,  261,
 +      260,  259,  258,  255,  254,  253,  250,  249,  248,  244,
 +
 +      243,  242,  241,  240,  239,  231,  230,  229,  224,  223,
 +      222,  221,  220,  219,  218,  215,  214,  209,  208,  207,
 +      206,  205,  202,  201,  200,  199,  198,  197,  196,  191,
 +      187,  186,  185,  184,  183,  182,  178,  177,  170,  169,
 +      168,  165,  162,  161,  160,  159,  158,  157,  156,  155,
 +      149,  148,  147,  146,  122,  112,  104,   63,   62,   61,
 +       48,   47,   46,  931,    3,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931
 +    } ;
 +
 +static yyconst flex_int16_t yy_chk[1139] =
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        54,  211,  212,   55,  767,   50,   52,   56,   58,   73,
+        59,   59,   59,   59,   59,  768,   57,   65,   66,   67,
+ 
+        74,   68,  169,   76,   60,  769,   69,   77,  170,   75,
+        78,   79,   70,   71,   72,  300,   80,   81,   98,   82,
+        84,   87,   83,   88,   85,  116,   92,   89,  301,   60,
+        90,  104,   86,   91,   93,   99,   94,   95,  101,   96,
+       117,  770,  100,  102,  149,   97,  108,  112,  105,  150,
+       109,  771,  118,  103,  110,  106,  119,  113,  120,  111,
+       128,  114,  121,  225,  129,  122,  123,  220,  124,  226,
+       115,  125,  221,  130,  126,  132,  235,  133,  172,  131,
+       134,  135,  142,  143,  136,  218,  173,  137,  138,  186,
+       187,  139,  140,  219,  188,  236,  141,  772,  144,   54,
+ 
+        54,   54,   54,   54,  156,  156,  156,  156,  156,  618,
+       237,  195,  238,  155,  619,  145,  773,  196,  157,  146,
+        58,  197,   59,   59,   59,   59,   59,  266,  147,  247,
+       248,  148,  261,  262,  283,  611,   60,  774,  155,  612,
+       158,  158,  267,  157,  159,  159,  159,  159,  159,  177,
+       284,  285,  178,  179,  199,  180,  181,  317,  318,  182,
+       200,   60,  201,  242,  255,  313,  243,  256,  314,  469,
+       470,  244,  202,  257,  159,  159,  159,  159,  159,  245,
+       775,  246,  273,  273,  553,  554,  274,  274,  274,  274,
+       274,  156,  156,  156,  156,  156,  276,  276,  776,  487,
+ 
+       277,  277,  277,  277,  277,  275,  159,  159,  159,  159,
+       159,  297,  329,  366,  274,  274,  274,  274,  274,  367,
+       298,  330,  376,  487,  388,  777,  331,  389,  404,  332,
+       275,  405,  778,  377,  378,  379,  406,  390,  380,  391,
+       407,  432,  408,  409,  433,  779,  410,  274,  274,  274,
+       274,  274,  411,  411,  780,  781,  412,  412,  412,  412,
+       412,  277,  277,  277,  277,  277,  277,  277,  277,  277,
+       277,  505,  508,  562,  644,  782,  563,  506,  645,  509,
+       667,  783,  674,  510,  412,  412,  412,  412,  412,  412,
+       412,  412,  412,  412,  640,  652,  698,  668,  746,  784,
+ 
+       785,  747,  786,  653,  675,  641,  674,  787,  788,  789,
+       642,  748,  790,  699,  791,  792,  749,  793,  794,  795,
+       698,  796,  797,  746,  798,  799,  747,  800,  801,  802,
+       803,  804,  805,  806,  807,  748,  808,  809,  810,  811,
+       749,  812,  813,  814,  815,  816,  817,  818,  819,  820,
+       821,  822,  823,  824,  825,  826,  827,  828,  829,  830,
+       831,  832,  833,  834,  835,  836,  837,  838,  839,  840,
+       841,  842,  843,  844,  845,  846,  847,  848,  849,  850,
+       851,  852,  853,  854,  855,  856,  857,  858,  859,  860,
+       861,  862,  863,  864,  865,  866,  867,  868,  869,  870,
+ 
+       871,  872,  873,  874,  875,  876,  877,  878,  879,  880,
+       881,  858,  882,  883,  884,  885,  886,  887,  888,  889,
+       890,  891,  892,  893,  894,  895,  896,  897,  898,  899,
+       900,  901,  902,  903,  904,  905,  906,  907,  908,  909,
+       910,  911,  912,  913,  914,  915,  916,  893,  917,  918,
+       919,  920,  921,  922,  923,  924,  925,  903,  926,  927,
+       928,  929,  930,  931,  932,  933,  934,  935,  936,  937,
+       938,  939,  940,  941,  942,  943,  944,  945,  946,  947,
+       948,  949,  950,  951,  952,  953,  954,  955,  956,  957,
+       958,  959,  960,  961,  962,  963,  964,  965,  966,  943,
+ 
+       967,  968,  969,  970,  971,  972,  973,  974,  975,  976,
+       977,  978,  979,  980,  981,  982,  983,  984,  985,  986,
+       987,  988,  989,  990,  991,  992,  993,  994,  995,  996,
+       997,  998,  999, 1000, 1001, 1002, 1003, 1004, 1005,   64,
+       766,  765,  764,  763,  762,  761,  760,  759,  758,  757,
+       756,  755,  754,  753,  752,  751,  750,  745,  744,  743,
+       742,  741,  740,  739,  738,  737,  736,  735,  734,  733,
+       732,  731,  730,  729,  728,  727,  726,  725,  724,  723,
+       722,  721,  720,  719,  718,  717,  716,  715,  714,  713,
+       712,  711,  710,  709,  708,  707,  706,  705,  704,  703,
+ 
+       702,  701,  700,  697,  696,  695,  694,  693,  692,  691,
+       690,  689,  688,  687,  686,  685,  684,  683,  682,  681,
+       680,  679,  678,  677,  676,  673,  672,  671,  670,  669,
+       666,  665,  664,  663,  662,  661,  660,  659,  658,  657,
+       656,  655,  654,  651,  650,  649,  648,  647,  646,  643,
+       639,  638,  637,  636,  635,  634,  633,  632,  631,  630,
+       629,  628,  627,  626,  625,  624,  623,  622,  621,  620,
+       617,  616,  615,  614,  613,  610,  609,  608,  607,  606,
+       605,  604,  603,  602,  601,  600,  599,  598,  597,  596,
+       595,  594,  593,  592,  591,  590,  589,  588,  587,  586,
+ 
+       585,  584,  583,  582,  581,  580,  579,  578,  577,  576,
+       575,  574,  573,  572,  571,  570,  569,  568,  567,  566,
+       565,  564,  561,  560,  559,  558,  557,  556,  555,  552,
+       551,  550,  549,  548,  547,  546,  545,  544,  543,  542,
+       541,  540,  539,  538,  537,  536,  535,  534,  533,  532,
+       531,  530,  529,  528,  527,  526,  525,  524,  523,  522,
+       521,  520,  519,  518,  517,  516,  515,  514,  513,  512,
+       511,  507,  504,  503,  502,  501,  500,  499,  498,  497,
+       496,  495,  494,  493,  492,  491,  490,  489,  488,  486,
+       485,  484,  483,  482,  481,  480,  479,  478,  477,  476,
+ 
+       475,  474,  473,  472,  471,  468,  467,  466,  465,  464,
+       463,  462,  461,  460,  459,  458,  457,  456,  455,  454,
+       453,  452,  451,  450,  449,  448,  447,  446,  445,  444,
+       443,  442,  441,  440,  439,  438,  437,  436,  435,  434,
+       431,  430,  429,  428,  427,  426,  425,  424,  423,  422,
+       421,  420,  419,  418,  417,  416,  415,  414,  413,  403,
+       402,  401,  400,  399,  398,  397,  396,  395,  394,  393,
+       392,  387,  386,  385,  384,  383,  382,  381,  375,  374,
+       373,  372,  371,  370,  369,  368,  365,  364,  363,  362,
+       361,  360,  359,  358,  357,  356,  355,  354,  353,  352,
+ 
+       351,  350,  349,  348,  347,  346,  345,  344,  343,  342,
+       341,  340,  339,  338,  337,  336,  335,  334,  333,  328,
+       327,  326,  325,  324,  323,  322,  321,  320,  319,  316,
+       315,  312,  311,  310,  309,  308,  307,  306,  305,  304,
+       303,  302,  299,  296,  295,  294,  293,  292,  291,  290,
+       289,  288,  287,  286,  282,  281,  280,  279,  278,  272,
+       271,  270,  269,  268,  265,  264,  263,  260,  259,  258,
+       254,  253,  252,  251,  250,  249,  241,  240,  239,  234,
+       233,  232,  231,  230,  229,  228,  227,  224,  223,  222,
+       217,  216,  215,  214,  213,  210,  209,  208,  207,  206,
+ 
+       205,  204,  203,  198,  194,  193,  192,  191,  190,  189,
+       185,  184,  183,  176,  175,  174,  171,  168,  167,  166,
+       165,  164,  163,  162,  161,  160,  154,  153,  152,  151,
+       127,  107,   63,   62,   61,   48,   47,   46, 1006,    3,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+ 
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006
+     } ;
+ 
+ static yyconst flex_int16_t yy_chk[1214] =
++>>>>>>> upstream/2.10.1+dfsg1
      {   0,
          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@@ -1336,240 -926,132 +1613,369 @@@
          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
          1,    1,    1,   12,   14,   13,   14,   14,   14,   14,
++<<<<<<< HEAD
 +       14,   99,   99,   15,   28,   12,   13,   15,   16,   23,
 +<<<<<<< HEAD
 +       16,   16,   16,   16,   16,  704,   15,   22,   22,   22,
 +
 +       23,   28,   73,   24,   16,  705,   22,   24,   73,   23,
 +       24,   24,   22,   22,   22,   75,   24,   24,   25,   24,
 +       36,   42,   25,   75,   36,   26,   42,   26,   27,   16,
 +       25,   26,   30,  171,   26,   29,   27,   26,   27,   27,
 +       29,   27,  171,  106,   33,   34,  706,   27,   33,   30,
 +       29,  106,   33,  120,   37,  120,   30,   33,   37,   34,
 +       91,   37,   37,  119,   37,   39,   91,   37,   34,   39,
 +       37,   89,   41,   41,   40,  707,   40,   89,   39,   40,
 +       40,   89,  119,   40,   39,  708,   40,   40,   41,  107,
 +       40,   40,  125,  125,  107,   40,   54,   54,   54,   54,
 +
 +       54,   82,   82,  136,  136,   41,   82,  173,  142,   41,
 +       54,   58,   58,   58,   58,   58,  110,  709,   41,  711,
 +      173,   41,  110,  142,   59,   58,   59,   59,   59,   59,
 +       59,  124,  712,  185,  124,   54,  185,   60,   60,  124,
 +       59,   60,   60,   60,   60,   60,  365,  124,   79,  124,
 +       58,   79,   79,  132,   79,   79,  132,  365,   79,  188,
 +      188,  486,  132,  150,  150,   59,  486,  150,  150,  150,
 +      150,  150,  151,  151,  151,  151,  151,  152,  152,  329,
 +      329,  152,  152,  152,  152,  152,  151,  153,  153,  153,
 +      153,  153,  154,  154,  154,  154,  154,  159,  199,  230,
 +
 +      288,  362,  344,  288,  239,  230,  247,  362,  713,  247,
 +      525,  151,  199,  159,  159,  199,  239,  260,  525,  247,
 +      260,  247,  417,  417,  428,  260,  344,  428,  714,  260,
 +      479,  260,  260,  716,  479,  260,  261,  261,  261,  261,
 +      261,  262,  262,  262,  262,  262,  263,  263,  717,  718,
 +      263,  263,  263,  263,  263,  264,  264,  264,  264,  264,
 +      265,  265,  265,  265,  265,  388,  388,  388,  388,  388,
 +      389,  389,  389,  389,  389,  513,  517,  549,  574,  623,
 +      517,  719,  623,  720,  721,  722,  513,  723,  724,  726,
 +      727,  513,  623,  728,  729,  574,  731,  623,  733,  549,
 +
 +      734,  549,  574,  735,  623,  736,  737,  623,  738,  739,
 +      740,  741,  744,  745,  746,  747,  623,  749,  750,  752,
 +      753,  623,  754,  755,  757,  758,  759,  761,  764,  765,
 +      766,  767,  768,  739,  769,  770,  772,  773,  774,  775,
 +      776,  777,  779,  780,  782,  783,  784,  786,  787,  789,
 +      791,  792,  793,  794,  795,  796,  798,  801,  802,  803,
 +      804,  806,  807,  808,  809,  810,  811,  780,  813,  814,
 +      816,  817,  818,  820,  822,  824,  793,  825,  826,  827,
 +      828,  831,  832,  833,  834,  835,  837,  838,  839,  841,
 +      842,  843,  844,  845,  846,  847,  848,  849,  850,  851,
 +
 +      852,  854,  855,  856,  857,  858,  860,  861,  863,  865,
 +      866,  838,  867,  868,  869,  870,  874,  875,  876,  877,
 +      878,  879,  880,  882,  883,  885,  886,  887,  888,  889,
 +      890,  892,  893,  894,  895,  896,  898,  902,  903,  904,
 +      905,  909,  703,  701,  700,  699,  696,  695,  694,  693,
 +      692,  691,  690,  689,  688,  687,  686,  685,  682,  681,
 +      680,  676,  675,  672,  671,  670,  669,  667,  666,  663,
 +      662,  661,  660,  659,  658,  657,  655,  654,  653,  652,
 +      651,  650,  649,  648,  647,  646,  645,  644,  643,  642,
 +      641,  640,  638,  637,  636,  633,  632,  631,  630,  628,
 +
 +      627,  626,  625,  624,  622,  621,  620,  619,  618,  617,
 +      616,  615,  614,  613,  612,  611,  610,  609,  608,  607,
 +      606,  605,  604,  602,  601,  600,  598,  597,  596,  595,
 +      594,  593,  592,  591,  588,  587,  586,  585,  584,  583,
 +      580,  579,  576,  575,  573,  572,  571,  570,  569,  568,
 +      567,  566,  565,  562,  559,  558,  557,  556,  554,  552,
 +      551,  550,  548,  546,  544,  543,  542,  541,  539,  537,
 +      536,  535,  532,  531,  530,  529,  528,  526,  524,  523,
 +      522,  520,  518,  514,  512,  511,  510,  509,  508,  507,
 +      506,  505,  504,  502,  501,  500,  498,  497,  494,  493,
 +
 +      491,  489,  487,  485,  483,  482,  481,  480,  478,  477,
 +      476,  475,  474,  472,  471,  470,  469,  468,  467,  464,
 +      463,  462,  461,  460,  459,  458,  457,  456,  455,  453,
 +      451,  450,  449,  447,  445,  444,  443,  442,  441,  439,
 +      438,  437,  435,  434,  432,  431,  430,  429,  427,  425,
 +      423,  422,  421,  418,  416,  415,  414,  413,  412,  411,
 +      410,  409,  408,  407,  406,  405,  404,  403,  402,  401,
 +      400,  399,  397,  395,  394,  393,  392,  391,  386,  385,
 +      383,  380,  379,  378,  377,  376,  375,  374,  371,  370,
 +      369,  368,  367,  366,  363,  361,  360,  357,  356,  355,
 +
 +      354,  353,  352,  351,  350,  349,  348,  347,  346,  343,
 +      342,  341,  340,  339,  338,  337,  336,  335,  334,  333,
 +      332,  331,  330,  328,  325,  324,  323,  322,  321,  320,
 +      319,  318,  315,  314,  313,  312,  311,  309,  308,  307,
 +      305,  303,  302,  301,  300,  299,  298,  296,  295,  294,
 +      293,  292,  290,  289,  287,  286,  285,  284,  283,  282,
 +      280,  278,  277,  276,  275,  274,  272,  271,  270,  269,
 +      268,  266,  259,  258,  257,  256,  255,  254,  253,  252,
 +      251,  250,  249,  248,  246,  245,  244,  243,  242,  241,
 +      240,  238,  237,  236,  235,  234,  233,  232,  231,  229,
 +
 +      228,  227,  226,  225,  224,  223,  222,  221,  220,  219,
 +      218,  217,  216,  215,  214,  213,  212,  211,  210,  209,
 +      208,  207,  206,  205,  204,  203,  202,  201,  200,  198,
 +      197,  195,  194,  193,  192,  191,  190,  187,  186,  184,
 +      183,  182,  181,  180,  179,  178,  176,  175,  174,  172,
 +      170,  169,  168,  167,  166,  165,  164,  163,  162,  161,
 +      160,  158,  157,  156,  155,  147,  146,  145,  144,  143,
 +      141,  140,  139,  135,  134,  133,  131,  130,  129,  128,
 +      127,  126,  123,  122,  121,  117,  116,  115,  114,  113,
 +      112,  111,  109,  108,  105,  104,  103,  101,  100,   98,
 +
 +       97,   96,   95,   94,   93,   92,   90,   88,   87,   86,
 +       85,   84,   83,   81,   80,   78,   77,   76,   74,   72,
 +       71,   70,   69,   68,   67,   66,   65,   53,   45,   44,
 +       43,   38,   35,   32,   21,   20,   19,   11,    9,    7,
 +        3,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +
 +      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
 +      908,  908,  908,  908,  908
 +=======
 +       16,   16,   16,   16,   16,  703,   15,   22,   22,   22,
 +
 +       23,   28,   73,   24,   16,  704,   22,   24,   73,   23,
 +       24,   24,   22,   22,   22,   75,   24,   24,   25,   24,
 +       36,   42,   25,   75,   36,   26,   42,   26,   27,   16,
 +       25,   26,   30,  171,   26,   29,   27,   26,   27,   27,
 +       29,   27,  171,  106,   33,   34,  705,   27,   33,   30,
 +       29,  106,   33,  173,   37,  107,   30,   33,   37,   34,
 +      107,   37,   37,  119,   37,   39,  173,   37,   34,   39,
 +       37,   89,   41,   41,   40,  706,   40,   89,   39,   40,
 +       40,   89,  119,   40,   39,  485,   40,   40,   41,  485,
 +       40,   40,  120,  707,  120,   40,   54,   54,   54,   54,
 +
 +       54,   82,   82,  125,  125,   41,   82,  136,  136,   41,
 +       54,   58,   58,   58,   58,   58,  110,  142,   41,  201,
 +      185,   41,  110,  185,   59,   58,   59,   59,   59,   59,
 +       59,  124,  142,  201,  124,   54,  201,   60,   60,  124,
 +       59,   60,   60,   60,   60,   60,  159,  124,   79,  124,
 +       58,   79,   79,   91,   79,   79,  708,  132,   79,   91,
 +      132,   91,  159,  159,  232,   59,  132,  709,  150,  150,
 +      232,   91,  150,  150,  150,  150,  150,  151,  151,  151,
 +      151,  151,  152,  152,  188,  188,  152,  152,  152,  152,
 +      152,  151,  153,  153,  153,  153,  153,  154,  154,  154,
 +
 +      154,  154,  241,  290,  249,  366,  290,  249,  333,  333,
 +      262,  366,  433,  262,  241,  433,  151,  249,  262,  249,
 +      421,  421,  262,  523,  262,  262,  712,  523,  262,  263,
 +      263,  263,  263,  263,  264,  264,  264,  264,  264,  265,
 +      265,  348,  713,  265,  265,  265,  265,  265,  266,  266,
 +      266,  266,  266,  267,  267,  267,  267,  267,  556,  369,
 +      392,  392,  392,  392,  392,  348,  369,  519,  548,  532,
 +      369,  393,  393,  393,  393,  393,  492,  532,  519,  582,
 +      556,  492,  556,  519,  633,  548,  714,  633,  715,  717,
 +      718,  719,  720,  721,  722,  723,  582,  633,  725,  726,
 +
 +      727,  728,  633,  582,  730,  731,  732,  733,  734,  633,
 +      735,  736,  633,  737,  738,  740,  741,  742,  743,  744,
 +      746,  633,  748,  749,  751,  752,  633,  753,  754,  755,
 +      756,  757,  760,  761,  762,  763,  766,  767,  769,  770,
 +      771,  772,  774,  775,  776,  778,  781,  782,  783,  784,
 +      785,  786,  787,  755,  789,  790,  791,  792,  793,  794,
 +      795,  797,  798,  800,  801,  802,  804,  805,  807,  809,
 +      810,  811,  812,  813,  814,  816,  819,  820,  821,  822,
 +      824,  825,  826,  827,  828,  829,  798,  830,  832,  833,
 +      835,  836,  837,  839,  841,  811,  843,  844,  845,  846,
 +
 +      847,  850,  851,  852,  853,  854,  855,  857,  858,  859,
 +      861,  862,  863,  864,  865,  866,  867,  868,  869,  870,
 +      871,  872,  873,  875,  876,  877,  878,  879,  881,  882,
 +      884,  886,  858,  887,  888,  889,  890,  891,  892,  896,
 +      897,  898,  900,  901,  902,  903,  905,  906,  908,  909,
 +      910,  911,  912,  913,  915,  916,  917,  918,  919,  921,
 +      925,  926,  927,  928,  932,  702,  701,  700,  699,  698,
 +      695,  694,  693,  692,  688,  687,  684,  683,  682,  681,
 +      679,  678,  677,  674,  673,  672,  671,  670,  669,  668,
 +      666,  665,  664,  663,  662,  661,  660,  659,  658,  657,
 +
 +      656,  655,  654,  653,  652,  651,  649,  648,  647,  645,
 +      643,  642,  641,  640,  638,  637,  636,  635,  634,  632,
 +      631,  630,  629,  628,  627,  626,  625,  624,  623,  622,
 +      621,  620,  619,  618,  617,  616,  615,  614,  613,  612,
 +      610,  609,  608,  606,  605,  604,  603,  602,  601,  600,
 +      599,  596,  595,  594,  593,  592,  591,  588,  587,  584,
 +      583,  581,  580,  579,  578,  577,  576,  575,  574,  573,
 +      571,  569,  566,  565,  564,  563,  561,  559,  558,  557,
 +      555,  553,  551,  550,  549,  546,  544,  543,  542,  539,
 +      538,  537,  536,  535,  533,  531,  530,  529,  528,  526,
 +
 +      524,  520,  518,  517,  516,  515,  514,  513,  512,  511,
 +      510,  508,  507,  506,  504,  503,  500,  499,  497,  495,
 +      493,  491,  489,  488,  487,  486,  484,  483,  482,  481,
 +      480,  479,  477,  476,  475,  474,  473,  472,  469,  468,
 +      467,  466,  465,  464,  463,  462,  461,  460,  458,  456,
 +      455,  454,  452,  450,  449,  448,  447,  446,  444,  443,
 +      442,  440,  439,  437,  436,  435,  434,  432,  430,  429,
 +      427,  426,  425,  422,  420,  419,  418,  417,  416,  415,
 +      414,  413,  412,  411,  410,  409,  408,  407,  406,  405,
 +      404,  403,  401,  399,  398,  397,  396,  395,  390,  389,
 +
 +      387,  384,  383,  382,  381,  380,  379,  378,  375,  374,
 +      373,  372,  371,  370,  367,  365,  364,  361,  360,  359,
 +      358,  357,  356,  355,  354,  353,  352,  351,  350,  347,
 +      346,  345,  344,  343,  342,  341,  340,  339,  338,  337,
 +      336,  335,  334,  332,  329,  328,  327,  326,  325,  324,
 +      323,  322,  319,  318,  317,  316,  315,  313,  312,  310,
 +      309,  307,  305,  304,  303,  302,  301,  300,  298,  297,
 +      296,  295,  294,  292,  291,  289,  288,  287,  286,  285,
 +      284,  282,  280,  279,  278,  277,  276,  274,  273,  272,
 +      271,  270,  268,  261,  260,  259,  258,  257,  256,  255,
 +
 +      254,  253,  252,  251,  250,  248,  247,  246,  245,  244,
 +      243,  242,  240,  239,  238,  237,  236,  235,  234,  233,
 +      231,  230,  229,  228,  227,  226,  225,  224,  223,  222,
 +      221,  220,  219,  218,  217,  216,  215,  214,  213,  212,
 +      211,  210,  209,  208,  207,  206,  205,  204,  203,  202,
 +      200,  199,  197,  196,  195,  194,  193,  192,  191,  190,
 +      187,  186,  184,  183,  182,  181,  180,  179,  178,  176,
 +      175,  174,  172,  170,  169,  168,  167,  166,  165,  164,
 +      163,  162,  161,  160,  158,  157,  156,  155,  147,  146,
 +      145,  144,  143,  141,  140,  139,  135,  134,  133,  131,
 +
 +      130,  129,  128,  127,  126,  123,  122,  121,  117,  116,
 +      115,  114,  113,  112,  111,  109,  108,  105,  104,  103,
 +      101,  100,   98,   97,   96,   95,   94,   93,   92,   90,
 +       88,   87,   86,   85,   84,   83,   81,   80,   78,   77,
 +       76,   74,   72,   71,   70,   69,   68,   67,   66,   65,
 +       53,   45,   44,   43,   38,   35,   32,   21,   20,   19,
 +       11,    9,    7,    3,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931,  931,  931,
 +      931,  931,  931,  931,  931,  931,  931,  931
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+        14,  102,  102,   15,  695,   12,   13,   15,   16,   23,
+        16,   16,   16,   16,   16,  696,   15,   22,   22,   22,
+ 
+        23,   22,   74,   24,   16,  697,   22,   24,   74,   23,
+        24,   24,   22,   22,   22,  179,   24,   24,   28,   24,
+        25,   26,   24,   26,   25,   35,   27,   26,  179,   16,
+        26,   30,   25,   26,   27,   28,   27,   27,   29,   27,
+        35,  698,   28,   29,   42,   27,   33,   34,   30,   42,
+        33,  699,   36,   29,   33,   30,   36,   34,   37,   33,
+        39,   34,   37,  114,   39,   37,   37,  110,   37,  114,
+        34,   37,  110,   39,   37,   40,  124,   40,   76,   39,
+        40,   40,   41,   41,   40,  109,   76,   40,   40,   84,
+        84,   40,   40,  109,   84,  124,   40,  700,   41,   54,
+ 
+        54,   54,   54,   54,   58,   58,   58,   58,   58,  520,
+       125,   91,  125,   54,  520,   41,  701,   91,   58,   41,
+        59,   91,   59,   59,   59,   59,   59,  147,   41,  130,
+       130,   41,  141,  141,  165,  513,   59,  702,   54,  513,
+        60,   60,  147,   58,   60,   60,   60,   60,   60,   80,
+       165,  165,   80,   80,   93,   80,   80,  195,  195,   80,
+        93,   59,   93,  129,  137,  192,  129,  137,  192,  347,
+       347,  129,   93,  137,  158,  158,  158,  158,  158,  129,
+       703,  129,  155,  155,  442,  442,  155,  155,  155,  155,
+       155,  156,  156,  156,  156,  156,  157,  157,  704,  364,
+ 
+       157,  157,  157,  157,  157,  156,  159,  159,  159,  159,
+       159,  177,  208,  242,  273,  273,  273,  273,  273,  242,
+       177,  208,  251,  364,  259,  705,  208,  259,  272,  208,
+       156,  272,  706,  251,  251,  251,  272,  259,  251,  259,
+       272,  301,  272,  272,  301,  707,  272,  274,  274,  274,
+       274,  274,  275,  275,  708,  709,  275,  275,  275,  275,
+       275,  276,  276,  276,  276,  276,  277,  277,  277,  277,
+       277,  385,  388,  454,  553,  711,  454,  385,  553,  388,
+       581,  712,  589,  388,  411,  411,  411,  411,  411,  412,
+       412,  412,  412,  412,  549,  562,  618,  581,  673,  713,
+ 
+       714,  673,  715,  562,  589,  549,  589,  716,  717,  718,
+       549,  673,  721,  618,  722,  723,  673,  725,  726,  727,
+       618,  728,  729,  673,  731,  733,  673,  734,  738,  740,
+       741,  742,  745,  746,  747,  673,  748,  749,  750,  751,
+       673,  752,  753,  754,  755,  756,  757,  759,  760,  762,
+       763,  764,  765,  767,  768,  769,  770,  771,  772,  773,
+       775,  776,  777,  778,  780,  781,  782,  783,  784,  785,
+       786,  787,  788,  789,  791,  792,  793,  794,  795,  798,
+       799,  801,  802,  804,  805,  806,  807,  808,  809,  810,
+       813,  814,  815,  816,  818,  822,  823,  825,  826,  827,
+ 
+       828,  830,  831,  832,  834,  837,  838,  839,  840,  841,
+       842,  808,  843,  844,  846,  847,  848,  849,  850,  851,
+       852,  853,  855,  856,  858,  859,  860,  862,  863,  865,
+       866,  868,  869,  870,  871,  872,  873,  875,  878,  879,
+       880,  881,  882,  884,  885,  886,  887,  856,  888,  889,
+       890,  891,  893,  894,  896,  897,  898,  870,  899,  901,
+       903,  905,  906,  907,  908,  909,  910,  913,  914,  915,
+       916,  917,  918,  919,  921,  922,  923,  925,  927,  928,
+       929,  930,  931,  932,  933,  934,  935,  936,  937,  938,
+       939,  940,  942,  943,  944,  945,  946,  948,  949,  922,
+ 
+       951,  952,  954,  955,  956,  957,  958,  959,  960,  961,
+       965,  966,  967,  968,  970,  971,  972,  973,  974,  976,
+       977,  979,  981,  982,  983,  984,  985,  986,  988,  989,
+       990,  991,  992,  993,  995, 1000, 1001, 1002, 1003, 1007,
+       694,  692,  691,  690,  688,  686,  685,  684,  683,  682,
+       681,  680,  678,  677,  676,  675,  674,  672,  671,  670,
+       669,  668,  667,  666,  665,  664,  663,  662,  661,  660,
+       659,  658,  657,  656,  655,  654,  653,  652,  651,  650,
+       649,  647,  646,  645,  643,  642,  641,  640,  639,  638,
+       637,  636,  635,  632,  631,  630,  629,  628,  627,  624,
+ 
+       623,  620,  619,  617,  616,  615,  614,  613,  612,  611,
+       610,  609,  607,  605,  602,  601,  600,  599,  598,  597,
+       596,  594,  592,  591,  590,  588,  586,  584,  583,  582,
+       580,  578,  576,  575,  574,  571,  570,  569,  568,  567,
+       566,  565,  563,  561,  560,  559,  558,  556,  554,  550,
+       548,  547,  546,  545,  544,  543,  542,  541,  540,  539,
+       537,  536,  535,  533,  532,  529,  527,  525,  523,  521,
+       519,  517,  516,  515,  514,  512,  511,  510,  509,  508,
+       507,  505,  504,  503,  502,  501,  500,  499,  498,  497,
+       494,  493,  492,  491,  490,  489,  488,  487,  486,  485,
+ 
+       483,  481,  480,  479,  477,  475,  474,  473,  472,  470,
+       469,  467,  466,  465,  463,  462,  460,  459,  458,  457,
+       456,  455,  453,  451,  450,  448,  447,  446,  443,  441,
+       440,  439,  438,  437,  436,  435,  434,  433,  432,  431,
+       430,  429,  428,  427,  426,  425,  424,  423,  421,  419,
+       418,  417,  416,  415,  414,  409,  408,  406,  403,  402,
+       401,  400,  399,  398,  397,  394,  393,  392,  391,  390,
+       389,  386,  384,  383,  380,  379,  378,  377,  376,  375,
+       374,  373,  372,  371,  370,  369,  368,  367,  366,  363,
+       362,  361,  360,  359,  358,  357,  356,  355,  354,  353,
+ 
+       352,  351,  350,  349,  348,  346,  343,  342,  341,  340,
+       339,  338,  337,  336,  333,  332,  331,  330,  329,  328,
+       327,  325,  324,  322,  321,  319,  317,  316,  315,  314,
+       313,  312,  310,  309,  308,  307,  306,  305,  303,  302,
+       300,  299,  298,  297,  296,  295,  293,  291,  290,  289,
+       288,  287,  285,  284,  283,  282,  281,  280,  278,  271,
+       270,  269,  268,  267,  266,  265,  264,  263,  262,  261,
+       260,  258,  257,  256,  255,  254,  253,  252,  250,  249,
+       248,  247,  246,  245,  244,  243,  241,  240,  239,  238,
+       237,  236,  235,  234,  233,  232,  231,  230,  229,  228,
+ 
+       227,  226,  225,  224,  223,  222,  221,  220,  219,  218,
+       217,  216,  215,  214,  213,  212,  211,  210,  209,  207,
+       206,  204,  203,  202,  201,  200,  199,  198,  197,  194,
+       193,  191,  190,  189,  188,  187,  186,  185,  184,  182,
+       181,  180,  178,  176,  175,  174,  173,  172,  171,  170,
+       169,  168,  167,  166,  164,  163,  162,  161,  160,  152,
+       151,  150,  149,  148,  146,  145,  144,  140,  139,  138,
+       136,  135,  134,  133,  132,  131,  128,  127,  126,  122,
+       121,  120,  119,  118,  117,  116,  115,  113,  112,  111,
+       108,  107,  106,  104,  103,  101,  100,   99,   98,   97,
+ 
+        96,   95,   94,   92,   90,   89,   88,   87,   86,   85,
+        83,   82,   81,   79,   78,   77,   75,   73,   72,   71,
+        70,   69,   68,   67,   66,   65,   53,   45,   44,   43,
+        38,   32,   21,   20,   19,   11,    9,    7,    3, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+ 
+      1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006,
+      1006, 1006, 1006
++>>>>>>> upstream/2.10.1+dfsg1
      } ;
  
  static yy_state_type yy_last_accepting_state;
@@@ -1649,11 -1131,7 +2055,15 @@@ void   skipline(void)
  #define YY_NO_UNISTD_H
  #endif
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 1080 "Gmsh.yy.cpp"
 +=======
 +#line 1093 "Gmsh.yy.cpp"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 1135 "Gmsh.yy.cpp"
++>>>>>>> upstream/2.10.1+dfsg1
  
  #define INITIAL 0
  
@@@ -1838,11 -1316,7 +2248,15 @@@ YY_DEC
  #line 72 "Gmsh.l"
  
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 1265 "Gmsh.yy.cpp"
 +=======
 +#line 1278 "Gmsh.yy.cpp"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 1320 "Gmsh.yy.cpp"
++>>>>>>> upstream/2.10.1+dfsg1
  
  	if ( !(yy_init) )
  		{
@@@ -1895,21 -1369,13 +2309,29 @@@ yy_match
  			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  				{
  				yy_current_state = (int) yy_def[yy_current_state];
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +				if ( yy_current_state >= 909 )
 +=======
 +				if ( yy_current_state >= 932 )
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 				if ( yy_current_state >= 1007 )
++>>>>>>> upstream/2.10.1+dfsg1
  					yy_c = yy_meta[(unsigned int) yy_c];
  				}
  			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
  			++yy_cp;
  			}
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +		while ( yy_base[yy_current_state] != 1042 );
 +=======
 +		while ( yy_base[yy_current_state] != 1065 );
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 		while ( yy_base[yy_current_state] != 1140 );
++>>>>>>> upstream/2.10.1+dfsg1
  
  yy_find_action:
  		yy_act = yy_accept[yy_current_state];
@@@ -2366,57 -1832,28 +2788,78 @@@ return tExit
  	YY_BREAK
  case 87:
  YY_RULE_SETUP
++<<<<<<< HEAD
 +#line 166 "Gmsh.l"
 +<<<<<<< HEAD
 +return tFileExists;
 +=======
 +return tFind;
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 165 "Gmsh.l"
+ return tExists;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 88:
  YY_RULE_SETUP
  #line 167 "Gmsh.l"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +return tFloor;
 +=======
 +return tFileExists;
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ return tFabs;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 89:
  YY_RULE_SETUP
  #line 168 "Gmsh.l"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +return tFmod;
 +=======
 +return tFixRelativePath;
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ return tField;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 90:
  YY_RULE_SETUP
  #line 169 "Gmsh.l"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +return tFor;
 +=======
 +return tFloor;
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ return tFind;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 91:
  YY_RULE_SETUP
  #line 170 "Gmsh.l"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +return tFunction;
 +	YY_BREAK
 +case 92:
 +YY_RULE_SETUP
 +#line 172 "Gmsh.l"
 +return tGetEnv;
 +	YY_BREAK
 +case 93:
 +YY_RULE_SETUP
 +#line 173 "Gmsh.l"
 +return tGetString;
 +=======
 +return tFmod;
++=======
+ return tFileExists;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 92:
  YY_RULE_SETUP
@@@ -2426,53 -1863,27 +2869,76 @@@ return tFixRelativePath
  case 93:
  YY_RULE_SETUP
  #line 172 "Gmsh.l"
++<<<<<<< HEAD
 +return tFunction;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 94:
 +YY_RULE_SETUP
 +#line 174 "Gmsh.l"
 +<<<<<<< HEAD
 +return tGetValue;
 +=======
 +return tGetEnv;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 95:
 +YY_RULE_SETUP
 +#line 175 "Gmsh.l"
 +<<<<<<< HEAD
 +return tGMSH_MAJOR_VERSION;
 +=======
 +return tGetString;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 96:
 +YY_RULE_SETUP
 +#line 176 "Gmsh.l"
 +<<<<<<< HEAD
 +return tGMSH_MINOR_VERSION;
 +=======
 +return tGetValue;
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ return tFloor;
+ 	YY_BREAK
+ case 94:
+ YY_RULE_SETUP
+ #line 173 "Gmsh.l"
+ return tFmod;
+ 	YY_BREAK
+ case 95:
+ YY_RULE_SETUP
+ #line 174 "Gmsh.l"
+ return tFor;
+ 	YY_BREAK
+ case 96:
+ YY_RULE_SETUP
+ #line 175 "Gmsh.l"
+ return tMacro;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 97:
  YY_RULE_SETUP
  #line 177 "Gmsh.l"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +return tGMSH_PATCH_VERSION;
 +	YY_BREAK
 +case 98:
 +YY_RULE_SETUP
 +#line 179 "Gmsh.l"
 +return tHide;
 +	YY_BREAK
 +case 99:
 +YY_RULE_SETUP
 +#line 180 "Gmsh.l"
 +return tHole;
 +=======
 +return tGMSH_MAJOR_VERSION;
++=======
+ return tGetEnv;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 98:
  YY_RULE_SETUP
@@@ -2482,35 -1893,17 +2948,49 @@@ return tGetString
  case 99:
  YY_RULE_SETUP
  #line 179 "Gmsh.l"
++<<<<<<< HEAD
 +return tGMSH_PATCH_VERSION;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 100:
 +YY_RULE_SETUP
 +#line 181 "Gmsh.l"
 +<<<<<<< HEAD
 +return tHomology;
 +=======
 +return tHide;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 101:
 +YY_RULE_SETUP
 +#line 182 "Gmsh.l"
 +<<<<<<< HEAD
 +return tHypot;
 +	YY_BREAK
 +case 102:
 +YY_RULE_SETUP
 +#line 184 "Gmsh.l"
 +return tIn;
 +	YY_BREAK
 +case 103:
 +YY_RULE_SETUP
 +#line 185 "Gmsh.l"
 +return tIf;
 +=======
 +return tHole;
++=======
+ return tGetNumber;
+ 	YY_BREAK
+ case 100:
+ YY_RULE_SETUP
+ #line 180 "Gmsh.l"
+ return tGetValue;
+ 	YY_BREAK
+ case 101:
+ YY_RULE_SETUP
+ #line 181 "Gmsh.l"
+ return tGMSH_MAJOR_VERSION;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 102:
  YY_RULE_SETUP
@@@ -2519,36 -1912,18 +2999,51 @@@ return tGMSH_MINOR_VERSION
  	YY_BREAK
  case 103:
  YY_RULE_SETUP
++<<<<<<< HEAD
 +#line 184 "Gmsh.l"
 +return tHypot;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 104:
 +YY_RULE_SETUP
 +#line 186 "Gmsh.l"
 +<<<<<<< HEAD
 +return tIntersect;
 +=======
 +return tIn;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 105:
 +YY_RULE_SETUP
 +#line 187 "Gmsh.l"
 +<<<<<<< HEAD
 +return tInterpolationScheme;
 +	YY_BREAK
 +case 106:
 +YY_RULE_SETUP
 +#line 189 "Gmsh.l"
 +return tNurbsKnots;
 +	YY_BREAK
 +case 107:
 +YY_RULE_SETUP
 +#line 191 "Gmsh.l"
 +return tLength;
 +=======
 +return tIf;
++=======
+ #line 183 "Gmsh.l"
+ return tGMSH_PATCH_VERSION;
+ 	YY_BREAK
+ case 104:
+ YY_RULE_SETUP
+ #line 184 "Gmsh.l"
+ return tGmshExecutableName;
+ 	YY_BREAK
+ case 105:
+ YY_RULE_SETUP
+ #line 186 "Gmsh.l"
+ return tHide;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 106:
  YY_RULE_SETUP
@@@ -2587,406 -1962,13 +3082,411 @@@ return tInterpolationScheme
  	YY_BREAK
  case 113:
  YY_RULE_SETUP
++<<<<<<< HEAD
 +#line 197 "Gmsh.l"
 +return tLog10;
 +>>>>>>> upstream/2.9.3+dfsg1
 +	YY_BREAK
 +case 114:
 +YY_RULE_SETUP
 +<<<<<<< HEAD
 +#line 192 "Gmsh.l"
 +return tLine;
 +	YY_BREAK
 +case 109:
 +YY_RULE_SETUP
 +#line 193 "Gmsh.l"
 +return tList;
 +	YY_BREAK
 +case 110:
 +YY_RULE_SETUP
 +#line 194 "Gmsh.l"
 +return tLog;
 +	YY_BREAK
 +case 111:
 +YY_RULE_SETUP
 +#line 195 "Gmsh.l"
 +return tLog10;
 +	YY_BREAK
 +case 112:
 +YY_RULE_SETUP
 +#line 196 "Gmsh.l"
 +return tLayers;
 +	YY_BREAK
 +case 113:
 +YY_RULE_SETUP
 +#line 197 "Gmsh.l"
 +return tLevelset;
++=======
+ #line 196 "Gmsh.l"
+ return tNurbsKnots;
++>>>>>>> upstream/2.10.1+dfsg1
  	YY_BREAK
  case 114:
  YY_RULE_SETUP
 +#line 199 "Gmsh.l"
 +return tMeshAlgorithm;
 +	YY_BREAK
 +case 115:
 +YY_RULE_SETUP
 +#line 200 "Gmsh.l"
 +return tModulo;
 +	YY_BREAK
 +case 116:
 +YY_RULE_SETUP
 +#line 201 "Gmsh.l"
 +return tMPI_Rank;
 +	YY_BREAK
 +case 117:
 +YY_RULE_SETUP
 +#line 202 "Gmsh.l"
 +return tMPI_Size;
 +	YY_BREAK
 +case 118:
 +YY_RULE_SETUP
 +#line 203 "Gmsh.l"
 +return tMemory;
 +	YY_BREAK
 +case 119:
 +YY_RULE_SETUP
 +#line 205 "Gmsh.l"
 +return tNurbs;
 +	YY_BREAK
 +case 120:
 +YY_RULE_SETUP
 +#line 207 "Gmsh.l"
 +return tOnelabAction;
 +	YY_BREAK
 +case 121:
 +YY_RULE_SETUP
 +#line 208 "Gmsh.l"
 +return tNurbsOrder;
 +	YY_BREAK
 +case 122:
 +YY_RULE_SETUP
 +#line 210 "Gmsh.l"
 +return tPeriodic;
 +	YY_BREAK
 +case 123:
 +YY_RULE_SETUP
 +#line 211 "Gmsh.l"
 +return tPhysical;
 +	YY_BREAK
 +case 124:
 +YY_RULE_SETUP
 +#line 212 "Gmsh.l"
 +return tPi;
 +	YY_BREAK
 +case 125:
 +YY_RULE_SETUP
 +#line 213 "Gmsh.l"
 +return tPlane;
 +	YY_BREAK
 +case 126:
 +YY_RULE_SETUP
 +#line 214 "Gmsh.l"
 +return tPoint;
 +	YY_BREAK
 +case 127:
 +YY_RULE_SETUP
 +#line 215 "Gmsh.l"
 +return tParametric;
 +	YY_BREAK
 +case 128:
 +YY_RULE_SETUP
 +#line 216 "Gmsh.l"
 +return tPolarSphere;
 +	YY_BREAK
 +case 129:
 +YY_RULE_SETUP
 +#line 217 "Gmsh.l"
 +return tPrintf;
 +	YY_BREAK
 +case 130:
 +YY_RULE_SETUP
 +#line 218 "Gmsh.l"
 +return tPlugin;
 +	YY_BREAK
 +case 131:
 +YY_RULE_SETUP
 +#line 220 "Gmsh.l"
 +return tQuadTriAddVerts;
 +	YY_BREAK
 +case 132:
 +YY_RULE_SETUP
 +#line 221 "Gmsh.l"
 +return tQuadTriNoNewVerts;
 +	YY_BREAK
 +case 133:
 +YY_RULE_SETUP
 +#line 223 "Gmsh.l"
 +return tQuadTriDbl;
 +	YY_BREAK
 +case 134:
 +YY_RULE_SETUP
 +#line 224 "Gmsh.l"
 +return tQuadTriSngl;
 +	YY_BREAK
 +case 135:
 +YY_RULE_SETUP
 +#line 226 "Gmsh.l"
 +return tRecombine;
 +	YY_BREAK
 +case 136:
 +YY_RULE_SETUP
 +#line 227 "Gmsh.l"
 +return tRecombLaterals;
 +	YY_BREAK
 +case 137:
 +YY_RULE_SETUP
 +#line 228 "Gmsh.l"
 +return tRecursive;
 +	YY_BREAK
 +case 138:
 +YY_RULE_SETUP
 +#line 229 "Gmsh.l"
 +return tRotate;
 +	YY_BREAK
 +case 139:
 +YY_RULE_SETUP
 +#line 230 "Gmsh.l"
 +return tRound;
 +	YY_BREAK
 +case 140:
 +YY_RULE_SETUP
 +#line 231 "Gmsh.l"
 +return tRuled;
 +	YY_BREAK
 +case 141:
 +YY_RULE_SETUP
 +#line 232 "Gmsh.l"
 +return tRand;
 +	YY_BREAK
 +case 142:
 +YY_RULE_SETUP
 +#line 233 "Gmsh.l"
 +return tRefineMesh;
 +	YY_BREAK
 +case 143:
 +YY_RULE_SETUP
 +#line 234 "Gmsh.l"
 +return tRelocateMesh;
 +	YY_BREAK
 +case 144:
 +YY_RULE_SETUP
 +#line 235 "Gmsh.l"
 +return tReturn;
 +	YY_BREAK
 +case 145:
 +YY_RULE_SETUP
 +#line 236 "Gmsh.l"
 +return tReverse;
 +	YY_BREAK
 +case 146:
 +YY_RULE_SETUP
 +#line 238 "Gmsh.l"
 +return tScaleLast;
 +	YY_BREAK
 +case 147:
 +YY_RULE_SETUP
 +#line 239 "Gmsh.l"
 +return tSmoother;
 +	YY_BREAK
 +case 148:
 +YY_RULE_SETUP
 +#line 240 "Gmsh.l"
 +return tSetOrder;
 +	YY_BREAK
 +case 149:
 +YY_RULE_SETUP
 +#line 241 "Gmsh.l"
 +return tSqrt;
 +	YY_BREAK
 +case 150:
 +YY_RULE_SETUP
 +#line 242 "Gmsh.l"
 +return tSin;
 +	YY_BREAK
 +case 151:
 +YY_RULE_SETUP
 +#line 243 "Gmsh.l"
 +return tSinh;
 +	YY_BREAK
 +case 152:
 +YY_RULE_SETUP
 +#line 244 "Gmsh.l"
 +return tSphere;
 +	YY_BREAK
 +case 153:
 +YY_RULE_SETUP
 +#line 245 "Gmsh.l"
 +return tSpline;
 +	YY_BREAK
 +case 154:
 +YY_RULE_SETUP
 +#line 246 "Gmsh.l"
 +return tSplit;
 +	YY_BREAK
 +case 155:
 +YY_RULE_SETUP
 +#line 247 "Gmsh.l"
 +return tSurface;
 +	YY_BREAK
 +case 156:
 +YY_RULE_SETUP
 +#line 248 "Gmsh.l"
 +return tStr;
 +	YY_BREAK
 +case 157:
 +YY_RULE_SETUP
 +#line 249 "Gmsh.l"
 +return tSprintf;
 +	YY_BREAK
 +case 158:
 +YY_RULE_SETUP
 +#line 250 "Gmsh.l"
 +return tStrCat;
 +	YY_BREAK
 +case 159:
 +YY_RULE_SETUP
 +#line 251 "Gmsh.l"
 +return tStrReplace;
 +	YY_BREAK
 +case 160:
 +YY_RULE_SETUP
 +#line 252 "Gmsh.l"
 +return tStrPrefix;
 +	YY_BREAK
 +case 161:
 +YY_RULE_SETUP
 +#line 253 "Gmsh.l"
 +return tStrRelative;
 +	YY_BREAK
 +case 162:
 +YY_RULE_SETUP
 +#line 254 "Gmsh.l"
 +return tStrFind;
 +	YY_BREAK
 +case 163:
 +YY_RULE_SETUP
 +#line 255 "Gmsh.l"
 +return tStrCmp;
 +	YY_BREAK
 +case 164:
 +YY_RULE_SETUP
 +#line 256 "Gmsh.l"
 +return tShow;
 +	YY_BREAK
 +case 165:
 +YY_RULE_SETUP
 +#line 257 "Gmsh.l"
 +return tSymmetry;
 +	YY_BREAK
 +case 166:
 +YY_RULE_SETUP
 +#line 258 "Gmsh.l"
 +return tSyncModel;
 +	YY_BREAK
 +case 167:
 +YY_RULE_SETUP
 +#line 260 "Gmsh.l"
 +return tText2D;
 +	YY_BREAK
 +case 168:
 +YY_RULE_SETUP
 +#line 261 "Gmsh.l"
 +return tText3D;
 +	YY_BREAK
 +case 169:
 +YY_RULE_SETUP
 +#line 262 "Gmsh.l"
 +return tTextAttributes;
 +	YY_BREAK
 +case 170:
 +YY_RULE_SETUP
 +#line 263 "Gmsh.l"
 +return tTime;
 +	YY_BREAK
 +case 171:
 +YY_RULE_SETUP
 +#line 264 "Gmsh.l"
 +return tTransfinite;
 +	YY_BREAK
 +case 172:
 +YY_RULE_SETUP
 +#line 265 "Gmsh.l"
 +return tTransfQuadTri;
 +	YY_BREAK
 +case 173:
 +YY_RULE_SETUP
 +#line 266 "Gmsh.l"
 +return tTranslate;
 +	YY_BREAK
 +case 174:
 +YY_RULE_SETUP
 +#line 267 "Gmsh.l"
 +return tTanh;
 +	YY_BREAK
 +case 175:
 +YY_RULE_SETUP
 +#line 268 "Gmsh.l"
 +return tTan;
 +	YY_BREAK
 +case 176:
 +YY_RULE_SETUP
 +#line 269 "Gmsh.l"
 +return tToday;
 +	YY_BREAK
 +case 177:
 +YY_RULE_SETUP
 +#line 270 "Gmsh.l"
 +return tTotalMemory;
 +	YY_BREAK
 +case 178:
 +YY_RULE_SETUP
 +#line 272 "Gmsh.l"
 +return tUndefineConstant;
 +	YY_BREAK
 +case 179:
 +YY_RULE_SETUP
 +#line 273 "Gmsh.l"
 +return tUsing;
 +	YY_BREAK
 +case 180:
 +YY_RULE_SETUP
 +#line 275 "Gmsh.l"
 +return tVolume;
 +	YY_BREAK
 +case 181:
 +#line 278 "Gmsh.l"
 +case 182:
 +#line 279 "Gmsh.l"
 +case 183:
 +#line 280 "Gmsh.l"
 +case 184:
 +YY_RULE_SETUP
 +#line 280 "Gmsh.l"
 +{ gmsh_yylval.d = atof((char *)gmsh_yytext); return tDOUBLE; }
 +	YY_BREAK
 +case 185:
 +YY_RULE_SETUP
 +#line 282 "Gmsh.l"
 +{ gmsh_yylval.c = strsave((char*)gmsh_yytext); return tSTRING; }
 +	YY_BREAK
 +case 186:
 +YY_RULE_SETUP
 +#line 284 "Gmsh.l"
 +return gmsh_yytext[0];
 +	YY_BREAK
 +case 187:
 +YY_RULE_SETUP
 +#line 286 "Gmsh.l"
 +ECHO;
 +	YY_BREAK
 +#line 2275 "Gmsh.yy.cpp"
 +=======
  #line 198 "Gmsh.l"
- return tLayers;
+ return tLength;
  	YY_BREAK
  case 115:
  YY_RULE_SETUP
@@@ -3351,21 -2342,61 +3860,66 @@@ return tTanh
  	YY_BREAK
  case 189:
  YY_RULE_SETUP
+ #line 282 "Gmsh.l"
+ return tTan;
+ 	YY_BREAK
+ case 190:
+ YY_RULE_SETUP
+ #line 283 "Gmsh.l"
+ return tToday;
+ 	YY_BREAK
+ case 191:
+ YY_RULE_SETUP
+ #line 284 "Gmsh.l"
+ return tTotalMemory;
+ 	YY_BREAK
+ case 192:
+ YY_RULE_SETUP
  #line 286 "Gmsh.l"
+ return tUndefineConstant;
+ 	YY_BREAK
+ case 193:
+ YY_RULE_SETUP
+ #line 287 "Gmsh.l"
+ return tUsing;
+ 	YY_BREAK
+ case 194:
+ YY_RULE_SETUP
+ #line 289 "Gmsh.l"
+ return tVolume;
+ 	YY_BREAK
+ case 195:
+ #line 292 "Gmsh.l"
+ case 196:
+ #line 293 "Gmsh.l"
+ case 197:
+ #line 294 "Gmsh.l"
+ case 198:
+ YY_RULE_SETUP
+ #line 294 "Gmsh.l"
+ { gmsh_yylval.d = atof((char *)gmsh_yytext); return tDOUBLE; }
+ 	YY_BREAK
+ case 199:
+ YY_RULE_SETUP
+ #line 296 "Gmsh.l"
  { gmsh_yylval.c = strsave((char*)gmsh_yytext); return tSTRING; }
  	YY_BREAK
- case 190:
+ case 200:
  YY_RULE_SETUP
- #line 288 "Gmsh.l"
+ #line 298 "Gmsh.l"
  return gmsh_yytext[0];
  	YY_BREAK
- case 191:
+ case 201:
  YY_RULE_SETUP
- #line 290 "Gmsh.l"
+ #line 300 "Gmsh.l"
  ECHO;
  	YY_BREAK
++<<<<<<< HEAD
 +#line 2308 "Gmsh.yy.cpp"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 2400 "Gmsh.yy.cpp"
++>>>>>>> upstream/2.10.1+dfsg1
  case YY_STATE_EOF(INITIAL):
  	yyterminate();
  
@@@ -3657,11 -2688,7 +4211,15 @@@ static int yy_get_next_buffer (void
  		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  			{
  			yy_current_state = (int) yy_def[yy_current_state];
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +			if ( yy_current_state >= 909 )
 +=======
 +			if ( yy_current_state >= 932 )
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 			if ( yy_current_state >= 1007 )
++>>>>>>> upstream/2.10.1+dfsg1
  				yy_c = yy_meta[(unsigned int) yy_c];
  			}
  		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@@ -3689,19 -2716,11 +4247,27 @@@
  	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
  		{
  		yy_current_state = (int) yy_def[yy_current_state];
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +		if ( yy_current_state >= 909 )
 +			yy_c = yy_meta[(unsigned int) yy_c];
 +		}
 +	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 +	yy_is_jam = (yy_current_state == 908);
 +=======
 +		if ( yy_current_state >= 932 )
 +			yy_c = yy_meta[(unsigned int) yy_c];
 +		}
 +	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 +	yy_is_jam = (yy_current_state == 931);
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 		if ( yy_current_state >= 1007 )
+ 			yy_c = yy_meta[(unsigned int) yy_c];
+ 		}
+ 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ 	yy_is_jam = (yy_current_state == 1006);
++>>>>>>> upstream/2.10.1+dfsg1
  
  		return yy_is_jam ? 0 : yy_current_state;
  }
@@@ -4371,11 -3390,7 +4937,15 @@@ void gmsh_yyfree (void * ptr 
  
  #define YYTABLES_NAME "yytables"
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#line 286 "Gmsh.l"
 +=======
 +#line 290 "Gmsh.l"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #line 300 "Gmsh.l"
++>>>>>>> upstream/2.10.1+dfsg1
  
  
  
diff --cc Solver/eigenSolver.cpp
index a2b3271,526c58f..af90fa4
--- a/Solver/eigenSolver.cpp
+++ b/Solver/eigenSolver.cpp
@@@ -190,30 -197,11 +201,31 @@@ bool eigenSolver::solve(int numEigenVal
      Msg::Warning("SLEPc failed");
      return false;
    }
 +  
 +}
  
 +void eigenSolver::normalize_mode(double scale) {
 +  Msg::Info("Normalize all eigenvectors");
 +  for (unsigned int i=0; i<_eigenVectors.size(); i++) {
 +    double norm = 0.;
 +    for (unsigned int j=0; j<_eigenVectors[i].size(); j++) {
 +      std::complex<double> val = _eigenVectors[i][j];
 +      double normval = std::abs(val);
 +      if (normval>norm)
 +        norm = normval;
 +    }
 +    if (norm==0) {
 +      Msg::Error("zero eigenvector");
 +      return;
 +    }
 +    for (unsigned int j=0; j<_eigenVectors[i].size(); j++) {
 +      _eigenVectors[i][j] *= (scale/norm);
 +    }
 +  }
  }
  
- void eigenSolver::normalize_mode(std::vector<int> modeView, double scale) {
+ void eigenSolver::normalize_mode(std::vector<int> modeView, double scale)
+ {
    Msg::Info("Normalize all eigenvectors");
    for (unsigned int imode=0; imode<modeView.size(); imode++) {
      int i = modeView[imode];
diff --cc Solver/linearSystemPETSc.h
index a4d8bf6,e7e1ddc..98f89e8
--- a/Solver/linearSystemPETSc.h
+++ b/Solver/linearSystemPETSc.h
@@@ -114,11 -114,8 +114,15 @@@ class linearSystemPETSc : public linear
    void zeroSolution();
    void printMatlab(const char *filename) const;
    virtual int systemSolve();
 +<<<<<<< HEAD
 +  Mat &getMatrix(){ return _a; }
 +=======
    Mat getMatrix(){ return _a; }
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+   virtual int matMult();
++>>>>>>> upstream/2.10.1+dfsg1
    //std::vector<scalar> getData();
    //std::vector<int> getRowPointers();
    //std::vector<int> getColumnsIndices();
diff --cc contrib/mobile/Android/AndroidManifest.xml
index 0451d62,4299db5..12eafc2
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@@ -1,12 -1,7 +1,17 @@@
  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
            package="org.geuz.onelab"
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +          android:versionCode="5"
 +          android:versionName="1.0.6"
 +=======
 +          android:versionCode="10"
 +          android:versionName="1.0.11"
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+           android:versionCode="11"
+           android:versionName="1.0.12"
++>>>>>>> upstream/2.10.1+dfsg1
            android:installLocation="auto" >
    
    <uses-sdk android:minSdkVersion="14"
diff --cc contrib/mobile/README.txt
index eec6f6d,4eee2f1..abc4195
--- a/contrib/mobile/README.txt
+++ b/contrib/mobile/README.txt
@@@ -1,35 -1,6 +1,35 @@@
  This directory contains the source code for Onelab/Mobile, the mobile version of
- Onelab for iOS and Android devices.
+ ONELAB for iOS and Android devices.
  
 +<<<<<<< HEAD
 +Copyright (C) 2014 Christophe Geuzaine and Maxime Graulich, University of Liege
 +
 +On iTunes:
 +
 +Onelab (http://onelab.info) is a finite element package based on the open source
 +mesh generator Gmsh (http://gmsh.info) and the solver GetDP
 +(http://getdp.info). It can be used to simulate a wide variety of multi-physic
 +problems: electromagnetics, thermics, mechanics...
 +
 +Onelab comes packaged with a selection of ready-to-use examples. New models can
 +be added through iTunes file sharing: see http://onelab.info/wiki/Mobile for
 +more information.
 +
 +https://itunes.apple.com/us/app/onelab/id845930897
 +
 +On Google Play:
 +
 +Onelab (http://onelab.info) is a finite element package based on the open source
 +mesh generator Gmsh (http://gmsh.info) and the solver GetDP
 +(http://getdp.info). It can be used to simulate a wide variety of multi-physic
 +problems: electromagnetics, thermics, mechanics... 
 +
 +Onelab comes packaged with a selection of ready-to-use examples. New models can
 +be opened directly on your device: see http://onelab.info/wiki/Mobile for more
 +information.
 +
 +https://play.google.com/store/apps/details?id=org.geuz.onelab
 +=======
  Copyright (C) 2014-2015 Christophe Geuzaine and Maxime Graulich, University of Liege
  
  Onelab/Mobile (http://onelab.info) is a finite element package based on the open
diff --cc contrib/mobile/iOS/Onelab/Onelab-Info.plist
index 3658c05,b2a21cd..e5023de
--- a/contrib/mobile/iOS/Onelab/Onelab-Info.plist
+++ b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
@@@ -35,19 -35,11 +35,27 @@@
      <key>CFBundlePackageType</key>
      <string>APPL</string>
      <key>CFBundleShortVersionString</key>
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +    <string>1.0.6</string>
 +    <key>CFBundleSignature</key>
 +    <string>????</string>
 +    <key>CFBundleVersion</key>
 +    <string>1.0.6</string>
 +=======
 +    <string>1.0.11</string>
 +    <key>CFBundleSignature</key>
 +    <string>????</string>
 +    <key>CFBundleVersion</key>
 +    <string>1.0.11</string>
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+     <string>1.0.12</string>
+     <key>CFBundleSignature</key>
+     <string>????</string>
+     <key>CFBundleVersion</key>
+     <string>1.0.12</string>
++>>>>>>> upstream/2.10.1+dfsg1
      <key>LSRequiresIPhoneOS</key>
      <true/>
      <key>UIFileSharingEnabled</key>
diff --cc doc/VERSIONS.txt
index b249aba,28af00c..67ba4cd
--- a/doc/VERSIONS.txt
+++ b/doc/VERSIONS.txt
@@@ -1,5 -1,14 +1,19 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
++=======
 +=======
+ 2.10.1 (July 30, 2015): minor fixes.
+ 
+ 2.10.0 (July 21, 2015): improved periodic meshing constraints; new Physical
+ specification with both label and numeric id; images can now be used as glyphs
+ in post-processing views, using text annotations with the `file://' prefix;
+ Views can be grouped and organized in subtrees; improved visibility browser
+ navigation; geometrical entities and post-processing views can now react to
+ double-clicks, via new generic DoubleClicked options; new Get/SetNumber and
+ Get/SetString for direct access to ONELAB variables; small bug fixes and code
+ cleanups.
+ 
++>>>>>>> upstream/2.10.1+dfsg1
  2.9.3 (April 18, 2015): updated versions of PETSc/SLEPc and OpenCASCADE/OCE
  libraries used in official binary builds; new Find() command; miscellaneous code
  cleanups and small fixes.
diff --cc doc/gmsh.html
index 68a5144,d7ab4a2..c6ab373
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@@ -29,11 -31,7 +31,15 @@@ element mesh generator with built-in pr
  
  <h4 align="center">Christophe Geuzaine and Jean-Fran�ois Remacle</h4>
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +<h4 align="center">Version 2.8.5, July 9 2014</h4>
 +=======
 +<h4 align="center">Version 2.9.3, April 18 2015</h4>
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ <h4 align="center">Version 2.10.1, July 30 2015</h4>
++>>>>>>> upstream/2.10.1+dfsg1
  
  <center>
    <a href="#Description">Description</a> |
@@@ -72,27 -70,15 +78,31 @@@ the <a href="doc/LICENSE.txt">GNU Gener
  <ul>
    <li>
      <p class="highlight">
 +<<<<<<< HEAD
 +      <strong>Current stable release</strong>: Windows
 +      <a href="bin/Windows/gmsh-2.8.5-Windows.zip"><strong>32 bit</strong></a> /
 +      <a href="bin/Windows/gmsh-2.8.5-Windows64.zip"><strong>64 bit</strong></a>,
 +      Linux
 +      <a href="bin/Linux/gmsh-2.8.5-Linux.tgz"><strong>32 bit</strong></a> /
 +      <a href="bin/Linux/gmsh-2.8.5-Linux64.tgz"><strong>64 bit</strong></a>,
 +      <a href="bin/MacOSX/gmsh-2.8.5-MacOSX.dmg"><strong>Mac OS X</strong></a>
 +      and
 +      <a href="src/gmsh-2.8.5-source.tgz"><strong>source code</strong></a>
 +=======
        <strong>Download current stable release</strong>: Windows
-       <a href="bin/Windows/gmsh-2.9.3-Windows32.zip"><strong>32 bit</strong></a> /
-       <a href="bin/Windows/gmsh-2.9.3-Windows64.zip"><strong>64 bit</strong></a>,
+       <a href="bin/Windows/gmsh-2.10.1-Windows32.zip"><strong>32 bit</strong></a> /
+       <a href="bin/Windows/gmsh-2.10.1-Windows64.zip"><strong>64 bit</strong></a>,
        Linux
-       <a href="bin/Linux/gmsh-2.9.3-Linux32.tgz"><strong>32 bit</strong></a> /
-       <a href="bin/Linux/gmsh-2.9.3-Linux64.tgz"><strong>64 bit</strong></a>,
-       <a href="bin/MacOSX/gmsh-2.9.3-MacOSX.dmg"><strong>Mac OS X</strong></a>
+       <a href="bin/Linux/gmsh-2.10.1-Linux32.tgz"><strong>32 bit</strong></a> /
+       <a href="bin/Linux/gmsh-2.10.1-Linux64.tgz"><strong>64 bit</strong></a>,
+       <a href="bin/MacOSX/gmsh-2.10.1-MacOSX.dmg"><strong>Mac OS X</strong></a>
        and
++<<<<<<< HEAD
 +      <a href="src/gmsh-2.9.3-source.tgz"><strong>source code</strong></a>
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+       <a href="src/gmsh-2.10.1-source.tgz"><strong>source code</strong></a>
++>>>>>>> upstream/2.10.1+dfsg1
      </p>
      <p>
        <em>A <a href="doc/texinfo/gmsh.html#Tutorial"><strong>tutorial</strong></a>
diff --cc doc/texinfo/gmsh.texi
index 05ed2ba,db231a2..7fc6ec8
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@@ -21,13 -21,8 +21,17 @@@
  @c =========================================================================
  @c %**start of header
  @setfilename gmsh.info
 +<<<<<<< HEAD
++<<<<<<< HEAD
 + at set GMSH-VERSION 2.8
 + at set COPYRIGHT @copyright{} 1997-2014 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
 +=======
 + at set GMSH-VERSION 2.9
++=======
+ @set GMSH-VERSION 2.10
++>>>>>>> upstream/2.10.1+dfsg1
  @set COPYRIGHT @copyright{} 1997-2015 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
 +>>>>>>> upstream/2.9.3+dfsg1
  @settitle Gmsh @value{GMSH-VERSION}
  @footnotestyle separate
  @setchapternewpage odd
@@@ -1051,8 -1039,14 +1058,19 @@@ the first string is greater than, equa
  string).  @code{TextAttributes} creates attributes for text
  strings. @code{Exists} checks if a variable with the given name exists
  (i.e., has been defined previously), and @code{FileExists} checks if the
++<<<<<<< HEAD
 +file with the given name exists.
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ file with the given name exists. @code{GetNumber} allows to get the
+ value of a ONELAB variable (the argument is the name of the
+ variable). @code{GetValue} allows to ask the user for a value
+ interactively. For example, inserting @code{GetValue("Value of parameter
+ alpha?", 5.76)} in an input file will query the user for the value of a
+ certain parameter alpha, assuming the default value is 5.76. If the
+ option @code{General.NoPopup} is set (@pxref{General options list}), no
+ question is asked and the default value is automatically used.
++>>>>>>> upstream/2.10.1+dfsg1
  
  @code{DefineNumber} allows to define a ONELAB variable in-line. The
  @var{expression} given as the first argument is the default value; this
diff --cc utils/misc/package_gmsh_getdp.sh
index b76c1fd,1dcddf0..db660e0
--- a/utils/misc/package_gmsh_getdp.sh
+++ b/utils/misc/package_gmsh_getdp.sh
@@@ -17,15 -17,10 +17,20 @@@ examples." > /tmp/README.tx
  GMSH=svn
  GETDP=svn
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +#GMSH=2.8.4
 +#GETDP=2.4.3
 +=======
 +#GMSH=2.8.5
 +#GETDP=2.4.4
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ #GMSH=2.9.3
+ #GETDP=2.5.1
++>>>>>>> upstream/2.10.1+dfsg1
  
- MODELS='machines relay inductor indheat magnetometer antennas acoustic_scattering time_reversal shielding waveguides transfo_simple ddm_wave_simple bloch_periodic_waveguides magnets thermal_conduction'
+ MODELS='machines relay inductor indheat magnetometer antennas acoustic_scattering time_reversal shielding waveguides transfo_simple ddm_waves bloch_periodic_waveguides magnets thermal_conduction magnetostriction superconductors'
  
  # get onelab models
  mkdir /tmp/models
diff --cc wrappers/gmshpy/gmshGeo.i
index 88c9dbe,454361a..0a2b7fa
--- a/wrappers/gmshpy/gmshGeo.i
+++ b/wrappers/gmshpy/gmshGeo.i
@@@ -180,9 -186,13 +186,15 @@@ namespace std 
      $self->pnt(xi0, xi1, xi2, p);
      return p;
    }
+   std::vector<double> xyz2uvw(double x, double y, double z) {
+     double xyz[3] = {x, y, z};
+     std::vector<double> uvw(3, 0.);
+     $self->xyz2uvw(xyz, &uvw[0]);
+     return uvw;
+   }
  }
 +<<<<<<< HEAD
 +=======
  
  %extend GEdge {
    void setTransfinite(int nbPointsTransfinite, int typeTransfinite = 0, double coeffTransfinite = 1) {
@@@ -210,4 -220,4 +222,8 @@@
      $self->meshAttributes.recombine3D = 1;
    }
  }
++<<<<<<< HEAD
 +>>>>>>> upstream/2.9.3+dfsg1
++=======
+ 
++>>>>>>> upstream/2.10.1+dfsg1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git



More information about the debian-science-commits mailing list