Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
===================================================================
--- ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 21105)
+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 21106)
@@ -51,7 +51,6 @@
 						 InterpFromMeshToGrid_matlab.la\
 						 InterpFromMesh2d_matlab.la\
 						 IssmConfig_matlab.la\
-						 Ll2xy_matlab.la\
 						 NodeConnectivity_matlab.la\
 						 M1qn3_matlab.la\
 						 MeshPartition_matlab.la\
@@ -60,8 +59,7 @@
 						 PropagateFlagsFromConnectivity_matlab.la\
 						 TriMesh_matlab.la\
 						 TriMeshProcessRifts_matlab.la\
-						 Scotch_matlab.la\
-						 Xy2ll_matlab.la
+						 Scotch_matlab.la
 
 if CHACO
 lib_LTLIBRARIES += Chaco_matlab.la
@@ -69,7 +67,7 @@
 if KRIGING
 lib_LTLIBRARIES +=  Kriging_matlab.la
 endif
-if KML
+ifKML
 lib_LTLIBRARIES += ShpRead_matlab.la
 endif
 #}}}
@@ -194,14 +192,6 @@
 IssmConfig_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
 IssmConfig_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-Xy2ll_matlab_la_SOURCES = ../Xy2ll/Xy2ll.cpp
-Xy2ll_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-Xy2ll_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
-Ll2xy_matlab_la_SOURCES = ../Ll2xy/Ll2xy.cpp
-Ll2xy_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-Ll2xy_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
 ExpSimplify_matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
 ExpSimplify_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
 ExpSimplify_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
Index: ../trunk-jpl/src/m/modules/Xy2ll.m
===================================================================
--- ../trunk-jpl/src/m/modules/Xy2ll.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/Xy2ll.m	(revision 21106)
@@ -1,31 +0,0 @@
-function [lat,lon] = Xy2ll(varargin);
-%XY2LL - x/y to lat/long coordinate transformation module:
-%	
-%	   This module transforms x/y to lat/long coordinates.
-%	
-%	   Usage:
-%	      [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);
-%	
-%	      x:           x coordinates (double vector)
-%	      y:           y coordinates (double vector)
-%	      sgn:         sign for hemisphere (double, +1 (north) or -1 (south))
-%	
-%	      central_meridian:     central meridian (double, optional, but must specify with sp)
-%	      standard_parallel:    standard parallel (double, optional, but must specify with cm)
-%	
-%	      lat:         latitude coordinates (double vector)
-%	      lon:         longitude coordinates (double vector)
-%	
-%	   Examples:
-%	      [lat,lon]=Xy2ll(x,y, 1);
-%	      [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);
-%	      [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);
-
-% Check usage
-if nargout~=2 && nargin~=3 && nargin~=7
-	help Xy2ll
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-[lat,lon]=Xy2ll_matlab(varargin{:});
Index: ../trunk-jpl/src/m/modules/KMLMeshWrite.m
===================================================================
--- ../trunk-jpl/src/m/modules/KMLMeshWrite.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/KMLMeshWrite.m	(revision 21106)
@@ -1,32 +0,0 @@
-function ierror = KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
-%	KMLMESHWRITE - KML mesh writer module:
-%	
-%	   This module writes the mesh of a model as KML polygons into the specified KML file.
-%	
-%	   Usage:
-%	      ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
-%	
-%	      name:       model name (string, may be empty)
-%	      notes:      model notes (string or cell array of strings, may be empty)
-%	      elem:       elements (double array)
-%	      nodecon:    nodal connectivity array (double array, may be empty)
-%	      lat:        nodal latititudes (double vector)
-%	      long:       nodal longitudes (double vector)
-%	      part:       nodal partitions (double vector, may be empty)
-%	      data:       nodal or element data (double vector, may be empty)
-%	      cmap:       color map (double nx3 array, may be empty)
-%	      kmlfile:    KML file name (string)
-%	
-%	      ierror:     error flag (double, non-zero for error)
-%	
-%	   Example:
-%	      KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);
-
-% Check usage
-if nargin~=10
-	help KMLMeshWrite
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-ierror = KMLMeshWrite_matlab(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
Index: ../trunk-jpl/src/m/modules/KMLOverlay.m
===================================================================
--- ../trunk-jpl/src/m/modules/KMLOverlay.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/KMLOverlay.m	(revision 21106)
@@ -1,35 +0,0 @@
-function ierror = KMLOverlay(varargin);
-%	KMLOverlay - KML file overlay module:
-%	
-%	   This module reads a list of image files and writes a KML or KMZ overlay file.
-%	
-%	   Usage:
-%	      ierror=KMLOverlay(kmlfile,'param name',param,...);
-%	
-%	      kmlfile:     KML or KMZ file name (string)
-%	
-%	      lataxis:     latitude axis (double vector [south north], required)
-%	      longaxis:    longitude axis (double vector [west east], required)
-%	      images:      relative or http image file names (string or array of strings or cell array of strings, required)
-%	      zip:         flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)
-%	
-%	      ierror:     error flag (double, non-zero for error)
-%	
-%	   Example:
-%	      KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);
-
-% Check usage
-if nargin~=7 && nargin~=9
-	help KMLOverlay
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-switch nargin
-	case 7
-		ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
-	case 9
-		ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9});
-	otherwise
-		ierror=-1; % ERROR (non-zero)
-end
Index: ../trunk-jpl/src/m/modules/Ll2xy.m
===================================================================
--- ../trunk-jpl/src/m/modules/Ll2xy.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/Ll2xy.m	(revision 21106)
@@ -1,40 +0,0 @@
-function [x,y] = Ll2xy(varargin);
-%LL2XY - lat/long to x/y coordinate transformation module:
-%	
-%	   This module transforms lat/long to x/y coordinates.
-%	
-%	   Usage:
-%	      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);
-%	
-%	      lat         latitude coordinates (double vector)
-%	      lon         longitude coordinates (double vector)
-%	      sgn         sign for hemisphere (double, +1 (north) or -1 (south))
-%	
-%	      central_meridian     central meridian (double, optional, but must specify with sp)
-%	      standard_parallel    standard parallel (double, optional, but must specify with cm)
-%	
-%	      x           x coordinates (double vector)
-%	      y           y coordinates (double vector)
-%	
-%	   Examples:
-%	      [x,y]=Ll2xy(lat,lon, 1);
-%	      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);
-%	      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);
-
-% Check usage
-if nargin~=3 && nargin~=7
-	help Ll2xy
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-switch nargin
-	case 3
-		[x,y]=Ll2xy_matlab(varargin{1},varargin{2},varargin{3});
-	case 7
-		[x,y]=Ll2xy_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
-	otherwise
-		error(['Error in Ll2xy', '']);
-end
-
-		
Index: ../trunk-jpl/src/m/modules/KMLFileRead.m
===================================================================
--- ../trunk-jpl/src/m/modules/KMLFileRead.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/KMLFileRead.m	(revision 21106)
@@ -1,39 +0,0 @@
-function [ierror] = KMLFileRead(varargin);
-%KMLFILEREAD - KML File Reader module
-%
-%   This module reads a KML File.
-%
-%   Usage:
-%      [ierror]=KMLFileRead(kmlfile,'param name',param,...);
-%
-%   kmlfile:	file name of kml file to be read (char)
-%   echo:	echo command (char, optional, 'off'/'on')
-%   deepecho:	deep echo command (char, optional, 'off'/'stdout'/kmlfile
-%   write:	write command (char, optiona, 'off'/'stdout'/kmlfile
-%
-%   ierror:	return code (non-zero for error)
-%
-%   Examples:
-%      [ierror]=KMLFileRead('file.kml','deepecho','on');
-%      [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');
-
-% Check usage
-if nargin~=1 && nargin~=3 && nargin~=5 && nargin~=7
-	help KMLFileRead
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-switch nargin
-	case 1
-		[ierror]=KMLFileRead_matlab(varargin{1});
-	case 3
-		[ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3});
-	case 5
-		[ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5});
-	case 7
-		[ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
-	otherwise
-		[ierror]=['Error using KMLFileRead'];
-end
-
Index: ../trunk-jpl/src/m/modules/Shp2Kml.m
===================================================================
--- ../trunk-jpl/src/m/modules/Shp2Kml.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/Shp2Kml.m	(revision 21106)
@@ -1,30 +0,0 @@
-function [ret]=Shp2Kml(varargin);
-%	SHP2KML - shp to kml file conversion module:
-%	
-%	   This module converts a file from shp to kml format.
-%	
-%	   Usage:
-%	      [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);
-%	
-%	      filshp:      file name of shp file to be read (char, extension optional)
-%	      filkml:      file name of kml file to be written (char)
-%	      sgn:         sign for hemisphere (double, +1 (north) -1 (south) or 0 (no translation))
-%	
-%	      central_meridian:     central meridian (double, optional, but must specify with sp)
-%	      standard_parallel:    standard parallel (double, optional, but must specify with cm)
-%	
-%	      ret:         return code (non-zero for warning)
-%	
-%	   Examples:
-%	      [ret]=Shp2Kml('file.shp','file.kml', 0);
-%	      [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);
-%	      [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);
-
-% Check usage
-if nargin~=3 && nargin~=7
-	help Shp2Kml
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-[ret]=Shp2Kml_matlab(varargin{:});
Index: ../trunk-jpl/src/m/modules/Exp2Kml.m
===================================================================
--- ../trunk-jpl/src/m/modules/Exp2Kml.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/Exp2Kml.m	(revision 21106)
@@ -1,39 +0,0 @@
-function [ret] = Exp2Kml(varargin);
-%EXP2KML - Converts a file from exp to kml format
-%
-%   Usage:
-%      [ret]=Exp2Kml(filexp,filkml,sgn,'param nam',param,...);
-%
-%   filexp:		file name of the exp file to be read (string)
-%   filkml:		file name of the kml file to be written (string)
-%   sgn:		sign for hemisphere (double, +1 (north) or -1 (south))
-%
-%   central_meridian:	central meridian (double, optional, but must specify with sp)
-%   standard_parallel:	standard parallel (double, optional, but must specify with cm)
-%   holes:		flag for treatment of multiple profiles (string, optional, 'yes' for holes)
-%
-%   ret:		return code (non-zero for warning)
-%
-%   Examples:
-%      [ret]=Exp2Kml('file.exp','file.kml', 1);
-%      [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');
-%      [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian',0, 'standard_parallel',71,'holes','yes');
-
-% Check usage
-if nargin~=3 && nargin~=7 && nargin~=9
-	help Exp2Kml
-	error('Wrong usage (see above)');
-end
-
-% Call mex module depending on number of arguments
-switch nargin
-	case 3
-		[ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3});
-	case 7
-		[ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
-	case 9
-		[ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9});
-	otherwise
-		error(['Exp2Kml not supported yet']);
-end
-
Index: ../trunk-jpl/src/m/modules/Kml2Exp.m
===================================================================
--- ../trunk-jpl/src/m/modules/Kml2Exp.m	(revision 21105)
+++ ../trunk-jpl/src/m/modules/Kml2Exp.m	(revision 21106)
@@ -1,38 +0,0 @@
-function [ret] = Kml2Exp(varargin);
-%	KML2EXP - kml to exp file conversion module:
-%	
-%	   This module converts a file from kml to exp format.
-%	
-%	   Usage:
-%	      [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);
-%	
-%	      filkml:      file name of kml file to be read (char)
-%	      filexp:      file name of exp file to be written (char)
-%	      sgn:         sign for hemisphere (double, +1 (north) or -1 (south))
-%	
-%	      central_meridian:     central meridian (double, optional, but must specify with sp)
-%	      standard_parallel:    standard parallel (double, optional, but must specify with cm)
-%	
-%	      ret:         return code (non-zero for warning)
-%	
-%	   Examples:
-%	      [ret]=Kml2Exp('file.kml','file.exp', 1);
-%	      [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);
-%	      [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);
-
-% Check usage
-if nargin~=3 && nargin~=7
-	help Kml2Exp
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-switch nargin
-	case 3
-		[ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3});
-	case 7
-		[ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
-	otherwise
-		[ret]=['Kml2Exp error'];
-end
-