Skip to content

Commit 478213d

Browse files
authored
Merge branch 'main' into alias-system
2 parents 8fd16d2 + 537d684 commit 478213d

40 files changed

+734
-190
lines changed

doc/api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ Low level access (these are mostly used by the :mod:`pygmt.clib` package):
309309
clib.Session.put_matrix
310310
clib.Session.put_strings
311311
clib.Session.put_vector
312+
clib.Session.read_data
312313
clib.Session.write_data
313314
clib.Session.open_virtualfile
314315
clib.Session.read_virtualfile

doc/external_resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Andre Belem
9797
:text-align: center
9898
:margin: 0 3 0 0
9999

100-
![](https://github.com/tktmyd/pygmt-howto-jp/raw/main/docs/_images/inf_on_map_12_0.png)
100+
![](https://github.com/tktmyd/pygmt-howto-jp/raw/main/docs/_images/01aed847a81445c7a002cce113d95886793f6236fbcccb233862486589f17ed1.png)
101101
+++
102102
Takuto Maeda
103103
::::

doc/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The project was started in 2017 by [Leonardo Uieda](http://www.leouieda.com) and
2222
[Paul Wessel](http://www.soest.hawaii.edu/wessel) (the co-creator and main developer of
2323
GMT) at the University of Hawaiʻi at Mānoa. The development of PyGMT has been supported
2424
by NSF grants [OCE-1558403](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1558403)
25-
and [EAR-1948603](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1948602).
25+
and [EAR-1948602](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1948602).
2626

2727
We welcome any feedback and ideas! Let us know by submitting
2828
[issues on GitHub](https://github.com/GenericMappingTools/pygmt/issues) or by posting on

doc/techref/encodings.md

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# Supported Encodings and Non-ASCII Characters
22

3-
GMT supports a number of encodings and each encoding contains a set of ASCII and non-ASCII
4-
characters. Below are some of the most common encodings and characters that are supported.
3+
GMT supports a number of encodings and each encoding contains a set of ASCII and
4+
non-ASCII characters. In PyGMT, you can use any of these ASCII and non-ASCII characters
5+
in arguments and text strings. When using non-ASCII characters in PyGMT, the easiest way
6+
is to copy and paste the character from the encoding tables below.
57

6-
In PyGMT, you can use any of these ASCII and non-ASCII characters in arguments and text
7-
strings. When using non-ASCII characters in PyGMT, the easiest way is to copy and paste
8-
the character from the tables below.
9-
10-
**Note**: The special character � (REPLACEMENT CHARACTER) is used to indicate that
11-
the character is not defined in the encoding.
8+
**Note**: The special character � (REPLACEMENT CHARACTER) is used to indicate
9+
that the character is not defined in the encoding.
1210

1311
## Adobe ISOLatin1+ Encoding
1412

@@ -106,3 +104,27 @@ the Unicode character set.
106104
| **\35x** | ➨ | ➩ | ➪ | ➫ | ➬ | ➭ | ➮ | ➯ |
107105
| **\36x** | � | ➱ | ➲ | ➳ | ➴ | ➵ | ➶ | ➷ |
108106
| **\37x** | ➸ | ➹ | ➺ | ➻ | ➼ | ➽ | ➾ | � |
107+
108+
## ISO/IEC 8859
109+
110+
GMT also supports the ISO/IEC 8859 standard for 8-bit character encodings. Refer to
111+
<https://en.wikipedia.org/wiki/ISO/IEC_8859> for descriptions of the different parts of
112+
the standard.
113+
114+
For a list of the characters in each part of the standard, refer to the following links:
115+
116+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-1>
117+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-2>
118+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-3>
119+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-4>
120+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-5>
121+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-6>
122+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-7>
123+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-8>
124+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-9>
125+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-10>
126+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-11>
127+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-13>
128+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-14>
129+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-15>
130+
- <https://en.wikipedia.org/wiki/ISO/IEC_8859-16>

doc/techref/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ visit the {gmt-docs}`GMT Technical Reference <reference.html>`.
88
```{toctree}
99
:maxdepth: 1
1010
11+
projections.rst
1112
encodings.md
1213
```

examples/projections/table/README.txt renamed to doc/techref/projections.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Projection Table
2-
----------------
1+
GMT Map Projections
2+
-------------------
33

44
The table below shows the projection codes for the 31 GMT projections:
55

examples/gallery/3d_plots/grdview_surface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def ackley(x, y):
6060
# Add colorbar for gridded data
6161
fig.colorbar(
6262
frame="a2f1", # Set annotations in steps of two, tick marks in steps of one
63-
position="JRM", # Place colorbar at position Right Middle
63+
position="JMR", # Place colorbar in the Middle Right (MR) corner
6464
)
6565

6666
fig.show()

examples/gallery/basemaps/double_y_axes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ class can control which axes should be plotted and optionally show annotations,
6363
# Plot points for y2 data
6464
fig.plot(x=x, y=y2, style="s0.28c", fill="red", label="y2")
6565

66-
# Create a legend in the top-left corner of the plot
66+
# Create a legend in the Top Left (TL) corner of the plot with an
67+
# offset of 0.1 centimeters
6768
fig.legend(position="jTL+o0.1c", box=True)
6869

6970
fig.show()

examples/gallery/embellishments/colorbar.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
horizontal (**L**\ eft, **C**\ enter, **R**\ ight) alignment codes, e.g.
1717
``position="jTR"`` for Top Right.
1818
- **g**: using map coordinates, e.g. ``position="g170/-45"`` for longitude
19-
170E, latitude 45S.
19+
170° East, latitude 45° South.
2020
- **x**: using paper coordinates, e.g. ``position="x5c/7c"`` for 5 cm, 7 cm
2121
from anchor point.
2222
- **n**: using normalized (0-1) coordinates, e.g. ``position="n0.4/0.8"``.
2323
2424
Note that the anchor point defaults to the bottom left (**BL**). Append ``+h``
25-
to ``position`` to get a horizontal colorbar instead of a vertical one
26-
(``+v``).
25+
to ``position`` to get a horizontal colorbar instead of a vertical one (``+v``).
2726
"""
2827

2928
# %%
@@ -34,7 +33,7 @@
3433

3534
# ============
3635
# Create a colorbar designed for seismic tomography - roma
37-
# Colorbar is placed at bottom center (BC) by default if no position is given
36+
# Colorbar is placed at Bottom Center (BC) by default if no position is given
3837
# Add quantity and unit as labels ("+l") to the x and y axes
3938
# Add annotations ("+a") in steps of 0.5 and ticks ("+f") in steps of 0.1
4039
fig.colorbar(cmap="roma", frame=["xa0.5f0.1+lVelocity", "y+lm/s"])
@@ -78,8 +77,8 @@
7877
# Plot the colorbar
7978
fig.colorbar(
8079
cmap=True, # Use colormap set up above
81-
# Colorbar placed inside the plot bounding box (j) at Bottom Left (BL),
82-
# offset (+o) by 0.5 cm horizontally and 0.8 cm vertically from anchor
80+
# Colorbar placed inside the plot bounding box (j) in the Bottom Left (BL) corner,
81+
# with an offset (+o) by 0.5 cm horizontally and 0.8 cm vertically from the anchor
8382
# point, and plotted horizontally (+h)
8483
position="jBL+o0.5c/0.8c+h",
8584
box=True,

examples/gallery/embellishments/inset.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# to "brown", the water to "lightblue", the shorelines width to "thin", and
1717
# adding a frame
1818
fig.coast(region="MG+r2", land="brown", water="lightblue", shorelines="thin", frame="a")
19-
# Create an inset, setting the position to top left, the width to 3.5 cm, and
20-
# the x- and y-offsets to 0.2 cm. The margin is set to 0, and the border is
21-
# "gold" with a pen size of 1.5 points.
19+
# Create an inset, placing it in the Top Left (TL) corner with a width of 3.5 cm and
20+
# x- and y-offsets of 0.2 cm. The margin is set to 0, and the border is "gold" with a
21+
# pen size of 1.5 points.
2222
with fig.inset(position="jTL+w3.5c+o0.2c", margin=0, box="+p1.5p,gold"):
2323
# Create a figure in the inset using coast. This example uses the azimuthal
2424
# orthogonal projection centered at 47E, 20S. The land color is set to

0 commit comments

Comments
 (0)