Create a prettytable alias, which is the one that is now exported.

src/GMT.jl

@@ -202,6 +202,8 @@ export
 	Date, DateTime, Year, Month, Week, Day, Hour, Minute, Second, year, month, week, day, hour, minute, second, now, today,
 	bissextile,
 
+	prettytable,
+
 	@?, @G, @dir
 
 include("common_docs.jl")

src/PrettyTables.jl

@@ -7,7 +7,7 @@
 # and no longer need a > 10 MB PT precomp cache DLL.
 ############################################################################################
 
-export pretty_table
+#export pretty_table
 
 #const _REGEX_ANSI_SEQUENCES = r"\x1B(?:]8;;[^\x1B]*\x1B\\|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])"
 
@@ -294,6 +294,8 @@ function pretty_table(@nospecialize(io::IO), @nospecialize(data::Any); header::U
 	return _print_table(io, pdata; header = pheader, kwargs...)
 end
 
+const prettytable = pretty_table	# Alias
+
 # --------------------------------------------------------------------------------
 @kwdef struct TextFormat
 	up_right_corner::Char                  = '┐'
@@ -1040,13 +1042,7 @@ function _check_hline(ptable::ProcessedTable, hlines::Vector{Int}, body_hlines::
 end
 
 function _check_hline(ptable::ProcessedTable, hlines::Symbol, body_hlines::AbstractVector, i::Int)
-	if hlines == :all
-		return true
-	elseif hlines == :none
-		return _check_hline(ptable, Int[], body_hlines, i)
-	else
-		error("`hlines` must be `:all`, `:none`, or a vector of integers.")
-	end
+	return (hlines == :all) ? true : (hlines == :none) ? _check_hline(ptable, Int[], body_hlines, i) : error("`hlines` must be `:all`, `:none`, or a vector of integers.")
 end
 
 function _check_vline(ptable::ProcessedTable, vlines::AbstractVector, j::Int)
@@ -1064,13 +1060,7 @@ function _check_vline(ptable::ProcessedTable, vlines::AbstractVector, j::Int)
 end
 
 function _check_vline(ptable::ProcessedTable, vlines::Symbol, j::Int)
-	if vlines == :all
-		return true
-	elseif vlines == :none
-		return false
-	else
-		error("`vlines` must be `:all`, `:none`, or a vector of integers.")
-	end
+	return (vlines == :all) ? true : (vlines == :none) ? false : error("`vlines` must be `:all`, `:none`, or a vector of integers.")
 end
 
 function _count_hlines(ptable::ProcessedTable, hlines::Vector{Int}, body_hlines::Vector{Int})
@@ -2551,8 +2541,7 @@ function _print_custom_text_cell!(display::Display, cell_data::CustomTextCell, c
 	# Write it to the display.
 	_write_to_display!(display, rendered_str, suffix, new_lstr + textwidth(suffix))
 
-	# Print the padding character after the cell and return if the display has reached
-	# end-of-line.
+	# Print the padding character after the cell and return if the display has reached end-of-line.
 	return _p!(display, " ", false, 1)
 end
 
@@ -2805,9 +2794,8 @@ function ProcessedTable(data::Any, header::Any;
 		elseif show_header
 			num_header_columns = length(first(header))
 
-			if num_data_columns != num_header_columns
+			(num_data_columns != num_header_columns) &&
 				error("The number of columns in the header ($num_header_columns) must be equal to that of the table ($num_data_columns).")
-			end
 
 			num_header_rows = show_subheader ? length(header) : 1
 		end

src/proj_utils.jl

@@ -1016,9 +1016,9 @@ function helper_geoglimits(prj::String, region::Vector{Float64})::Vector{Float64
 	Gdal.CPLPushErrorHandler(@cfunction(Gdal.CPLQuietErrorHandler, Cvoid, (UInt32, Cint, Cstring)))
 	opts = ["-s_srs", prj, "-t_srs", prj4WGS84, "-overwrite"]
 	ds = Gdal.get_gdaldataset([region[1] region[3]], opts, false)[1]
-	o1 = Gdal.gdalvectortranslate(ds, opts; dest="/vsimem/tmp", gdataset=true)
+	o1 = Gdal.gdalvectortranslate(ds, opts; dest="/vsimem/tmp", gdataset=true)::GMT.Gdal.IDataset
 	ds = Gdal.get_gdaldataset([region[2] region[4]], opts, false)[1]
-	o2 = Gdal.gdalvectortranslate(ds, opts; dest="/vsimem/tmp", gdataset=true)
+	o2 = Gdal.gdalvectortranslate(ds, opts; dest="/vsimem/tmp", gdataset=true)::GMT.Gdal.IDataset
 	if (o1.ptr == C_NULL || o2.ptr == C_NULL)		# Diagonals failed, probably a Mollweide or alike projection
 		t = xy2lonlat([region[1] min(0,region[4]); region[2] min(0,region[4]);
 		               0 region; 0 region], s_srs=prj, t_srs=prj4WGS84)

src/spatial_funs.jl

@@ -346,6 +346,7 @@ end
 See `? getbyattrib`
 """
 Base.:filter(D::Vector{<:GMTdataset}; kw...) = getbyattrib(D; kw...)
+
 # ---------------------------------------------------------------------------------------------------
 """
     findall(D::Vector{<:GMTdataset}; kw...)

src/utils_types.jl

@@ -67,8 +67,9 @@ does not need explicit coordinates to place the text.
   - `segnan` or `nanseg`: Boolean. If true make a multi-segment made out of segments separated by NaNs.
   - `datatype`: Keep the original data type of `mat`. Default converts to Float64.
   - `geom`: The data geometry. By default, we set `wkbUnknown` but try to do some basic guess.
-  - `proj` or `proj4`:  A proj4 string for dataset SRS.
-  - `wkt`:  A WKT SRS.
+  - `proj` or `proj4`: A proj4 string for dataset SRS. Default is empty. To set it to lon,lat in WGS84 use ``proj=prj4WGS84``
+  - `wkt`:  A WKT SRS string.
+  - `epsg`: An integer EPSG code. _e.g._ ``epsg=4326`` for lon,lat in WGS84. Default is 0.
   - `colnames`: Optional string vector with names for each column of `mat`.
   - `attrib`: Optional dictionary{String, String} with attributes of this dataset.
   - `ref:` Pass in a reference GMTdataset from which we'll take the georeference info as well as `attrib` and `colnames`

test/test_PT_alignments.jl

@@ -26,7 +26,7 @@ data = Any[1    false      1.0     0x01 ;
 │ 6      │ true   │ 6.0    │ 6      │
 └────────┴────────┴────────┴────────┘
 """
-    result = pretty_table(String, data; alignment = :l)
+    result = prettytable(String, data; alignment = :l)
     @test result == expected
 
     # == Center ============================================================================
@@ -42,7 +42,7 @@ data = Any[1    false      1.0     0x01 ;
 │   6    │  true  │  6.0   │   6    │
 └────────┴────────┴────────┴────────┘
 """
-    result = pretty_table(String, data; alignment = :c)
+    result = prettytable(String, data; alignment = :c)
     @test result == expected
 
     # == Per Column Configuration ==========================================================
@@ -59,7 +59,7 @@ data = Any[1    false      1.0     0x01 ;
 │ 6      │   true │  6.0   │      6 │
 └────────┴────────┴────────┴────────┘
 """
-    result = pretty_table(String, data; alignment = [:l, :r, :c, :r])
+    result = prettytable(String, data; alignment = [:l, :r, :c, :r])
     @test result == expected
 
     # == Cell Override =====================================================================
@@ -76,7 +76,7 @@ data = Any[1    false      1.0     0x01 ;
 │ 6      │   true │  6.0   │ 6      │
 └────────┴────────┴────────┴────────┘
 """
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         alignment = [:l, :r, :c, :r],
@@ -110,7 +110,7 @@ data = Any[1    false      1.0     0x01 ;
 └───────────┴───────────┴───────────┴───────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -142,7 +142,7 @@ data = Any[1    false      1.0     0x01 ;
 └───────────┴───────────┴───────────┴───────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String, data;
         header = header,
         alignment = [:l, :r, :c, :r],
@@ -183,15 +183,15 @@ end
 └────────────┴────────────┴──────────────┴──────────────┴────────────────┴────────────────┴────────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\."])
     )
 
     @test result == expected
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(i => [r"\."] for i in 1:7)
@@ -213,7 +213,7 @@ end
 └───────────┴───────────┴─────────────┴─────────────┴───────────────┴───────────────┴───────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\.", r"^"])
@@ -237,7 +237,7 @@ end
 └─────┴─────────┴─────────┴─────────┴─────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix,
         alignment_anchor_regex = Dict(4 => [r"\.", r"^"]),
@@ -260,7 +260,7 @@ end
 └─────┴───┴─────────┴─────────┴─────────┴─────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix,
         alignment_anchor_regex = Dict(4 => [r"\.", r"^"]),
@@ -286,7 +286,7 @@ end
 └─────────┴─────────┴─────────┴──────────────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(4 => [r"\.", r"^"]),
@@ -309,7 +309,7 @@ end
 └─────────┴─────────┴─────────┴──────────────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment = :c,
@@ -333,7 +333,7 @@ end
 └─────────┴─────────┴─────────┴──────────────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment = :l,
@@ -359,7 +359,7 @@ end
 └─────────────────┴─────────────────┴─────────────────┴─────────────────┴─────────────────┴─────────────────┴─────────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(4 => [r"\.", r"^"]),
@@ -382,7 +382,7 @@ end
 └─────────┴─────────┴─────────┴────────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(4 => [r"\.", r"^"]),
@@ -407,7 +407,7 @@ end
 └──────────┴──────────┴───────────┴──────────┴────────────┴────────────┴────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(i => [r"\."] for i in 1:7),
@@ -430,7 +430,7 @@ end
 └──────────────┴──────────────┴──────────────┴─────────────┴────────────┴───────────┴─────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(i => [r"\."] for i in 1:7),
@@ -453,7 +453,7 @@ end
 └────────────┴──────────┴──────────────┴─────────────┴────────────────┴────────────────┴────────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\."]),
@@ -476,7 +476,7 @@ end
 └──────────┴──────────┴───────────┴─────────────┴────────────────┴────────────┴────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\."]),
@@ -502,7 +502,7 @@ end
 └─────┴──────────┴──────────┴───────────┴─────────────┴────────────────┴────────────┴────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\."]),
@@ -527,7 +527,7 @@ end
 └───────┴──────────┴──────────┴───────────┴─────────────┴────────────────┴────────────┴────────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         matrix;
         alignment_anchor_regex = Dict(0 => [r"\."]),

test/test_PT_column_width.jl

@@ -30,7 +30,7 @@ data = Any[1    false      1.0     0x01 ;
 └──────┴───────┴──────┴──────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -53,7 +53,7 @@ data = Any[1    false      1.0     0x01 ;
 └────┴────┴────┴────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -77,7 +77,7 @@ data = Any[1    false      1.0     0x01 ;
 └────┴───────┴────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -100,7 +100,7 @@ data = Any[1    false      1.0     0x01 ;
 └──────────┴──────────┴──────────┴──────────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -124,7 +124,7 @@ data = Any[1    false      1.0     0x01 ;
 └───┴─────┴─────┴───┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -147,7 +147,7 @@ data = Any[1    false      1.0     0x01 ;
 └───┴────┴─────┴──────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -171,7 +171,7 @@ data = Any[1    false      1.0     0x01 ;
 └───┴─────┴────┴───┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,
@@ -194,7 +194,7 @@ data = Any[1    false      1.0     0x01 ;
 └─────┴─────┴─────┴─────┘
 """
 
-    result = pretty_table(
+    result = prettytable(
         String,
         data;
         header = header,