From 5b2e54fbe5f62518354fc276a303f57e2f5d4112 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sat, 26 Aug 2023 14:41:06 +1200 Subject: [PATCH 1/4] =?UTF-8?q?Use=20Okina=20in=20Hawai=CA=BBi=20and=20?= =?UTF-8?q?=C4=81=20with=20macron=20in=20M=C4=81noa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replacing apostrophe with Okina letter in a few places. Approximating the Okina letter with a ` (octal code 140) for the roads gallery example. --- AUTHORS.md | 6 +++--- CITATION.cff | 4 ++-- doc/overview.rst | 2 +- examples/gallery/lines/roads.py | 4 ++-- pygmt/clib/session.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 2b51fa6a7f4..97c1e6600f1 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,8 +2,8 @@ This project was started in 2017 by [Leonardo Uieda](http://www.leouieda.com) during [an NSF funded postdoc](http://www.leouieda.com/blog/hawaii-gmt-postdoc.html) -with [Paul Wessel](http://www.soest.hawaii.edu/wessel) at the University of Hawaii at -Manoa. +with [Paul Wessel](https://www.soest.hawaii.edu/wessel) at the University of +Hawaiʻi at Mānoa. The following people have contributed code and/or documentation to the project (alphabetical by name) and are considered to be "PyGMT Developers": @@ -18,7 +18,7 @@ The following people have contributed code and/or documentation to the project * [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom * [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA * [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany -* [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA +* [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawaiʻi at Mānoa, USA * [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | SNP Innovation Lab GmbH, Germany * [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA * [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Development Seed, USA diff --git a/CITATION.cff b/CITATION.cff index 38189a9cd89..390d1e6f3a4 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -26,7 +26,7 @@ authors: orcid: https://orcid.org/0000-0001-8759-2018 - given-names: Max family-names: Jones - affiliation: University of Hawai'i at Mānoa, USA + affiliation: University of Hawaiʻi at Mānoa, USA orcid: https://orcid.org/0000-0003-0180-8928 - given-names: Yvonne family-names: Fröhlich @@ -74,7 +74,7 @@ authors: orcid: https://orcid.org/0000-0002-0268-7032 - given-names: Paul family-names: Wessel - affiliation: University of Hawai'i at Mānoa, USA + affiliation: University of Hawaiʻi at Mānoa, USA orcid: https://orcid.org/0000-0001-5708-7336 date-released: 2023-03-31 doi: 10.5281/zenodo.7772533 diff --git a/doc/overview.rst b/doc/overview.rst index 0f2f5cce08f..c0e2f5c0ff3 100644 --- a/doc/overview.rst +++ b/doc/overview.rst @@ -24,7 +24,7 @@ files and get only the more convenient formats like PDF and PNG. The project was started in 2017 by `Leonardo Uieda `__ and `Paul Wessel `__ (the co-creator and main -developer of GMT) at the University of Hawaii at Manoa. +developer of GMT) at the University of Hawaiʻi at Mānoa. The development of PyGMT has been supported by NSF grants `OCE-1558403 `__ and `EAR-1948603 `__. diff --git a/examples/gallery/lines/roads.py b/examples/gallery/lines/roads.py index 7eb0db091cc..aea6cc9cd82 100644 --- a/examples/gallery/lines/roads.py +++ b/examples/gallery/lines/roads.py @@ -24,10 +24,10 @@ fig = pygmt.Figure() -# Define target region around O'ahu (Hawai'i) +# Define target region around Oʻahu (Hawaiʻi) region = [-158.3, -157.6, 21.2, 21.75] # xmin, xmax, ymin, ymax -title = r"Main roads of O\047ahu (Hawai\047i)" # \047 is octal code for ' +title = r"Main roads of O\140ahu (Hawai\140i)" # \140 is octal code for `, approximating the Okina ʻ fig.basemap(region=region, projection="M12c", frame=["af", f"WSne+t{title}"]) fig.coast(land="gray", water="dodgerblue4", shorelines="1p,black") diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index 918d26b09b6..fdfdb67268e 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -1641,7 +1641,7 @@ def extract_region(self): 0.00, 10.00, -20.00, -10.00 Using ISO country codes for the regions (for example ``'US.HI'`` for - Hawaii): + Hawaiʻi): >>> fig = pygmt.Figure() >>> fig.coast( From 9ddc1d058ade202226ad994ea46a2834914327fd Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sat, 26 Aug 2023 14:41:31 +1200 Subject: [PATCH 2/4] Use https versions of Leo's websites --- AUTHORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 97c1e6600f1..fec4e4fa85d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,7 +1,7 @@ # Project Contributors -This project was started in 2017 by [Leonardo Uieda](http://www.leouieda.com) -during [an NSF funded postdoc](http://www.leouieda.com/blog/hawaii-gmt-postdoc.html) +This project was started in 2017 by [Leonardo Uieda](https://www.leouieda.com) +during [an NSF funded postdoc](https://www.leouieda.com/blog/hawaii-gmt-postdoc) with [Paul Wessel](https://www.soest.hawaii.edu/wessel) at the University of Hawaiʻi at Mānoa. From 9f45cd6a0a4c02c7f18511cb91b360698bcee0ca Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sat, 26 Aug 2023 20:16:20 +1200 Subject: [PATCH 3/4] Use backtick instead of \140 octal code Co-authored-by: Dongdong Tian --- examples/gallery/lines/roads.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/gallery/lines/roads.py b/examples/gallery/lines/roads.py index aea6cc9cd82..4db99e5c2a4 100644 --- a/examples/gallery/lines/roads.py +++ b/examples/gallery/lines/roads.py @@ -27,7 +27,7 @@ # Define target region around Oʻahu (Hawaiʻi) region = [-158.3, -157.6, 21.2, 21.75] # xmin, xmax, ymin, ymax -title = r"Main roads of O\140ahu (Hawai\140i)" # \140 is octal code for `, approximating the Okina ʻ +title = "Main roads of O`ahu (Hawai`i)" # Approximating the Okina letter ʻ with ` fig.basemap(region=region, projection="M12c", frame=["af", f"WSne+t{title}"]) fig.coast(land="gray", water="dodgerblue4", shorelines="1p,black") From 8c57ea4148dc70cc59073329b0ca2a584b9af48c Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:55:00 +1200 Subject: [PATCH 4/4] Use double quotes to surround US.HI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Yvonne Fröhlich <94163266+yvonnefroehlich@users.noreply.github.com> --- pygmt/clib/session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index fdfdb67268e..ffe675e1bc4 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -1640,7 +1640,7 @@ def extract_region(self): >>> print(", ".join([f"{x:.2f}" for x in wesn])) 0.00, 10.00, -20.00, -10.00 - Using ISO country codes for the regions (for example ``'US.HI'`` for + Using ISO country codes for the regions (for example ``"US.HI"`` for Hawaiʻi): >>> fig = pygmt.Figure() @@ -1654,7 +1654,7 @@ def extract_region(self): -164.71, -154.81, 18.91, 23.58 The country codes can have an extra argument that rounds the region a - multiple of the argument (for example, ``'US.HI+r5'`` will round the + multiple of the argument (for example, ``"US.HI+r5"`` will round the region to multiples of 5): >>> fig = pygmt.Figure()