Ensure non-ASCII characters are typeset correctly even if PS_CHAR_ENCODING is not 'ISOLatin1+'

Author: seisman

pygmt/helpers/utils.py

@@ -506,17 +506,16 @@ def build_arg_list(  # noqa: PLR0912
         else:
             gmt_args.append(f"-{key}{value}")
 
-    # Convert non-ASCII characters (if any) in the arguments to octal codes
-    encoding = _check_encoding("".join(gmt_args))
-    if encoding != "ascii":
-        gmt_args = [non_ascii_to_octal(arg, encoding=encoding) for arg in gmt_args]
     gmt_args = sorted(gmt_args)
 
-    # Set --PS_CHAR_ENCODING=encoding if necessary
-    if encoding not in {"ascii", "ISOLatin1+"} and not (
-        confdict and "PS_CHAR_ENCODING" in confdict
-    ):
-        gmt_args.append(f"--PS_CHAR_ENCODING={encoding}")
+    # Convert non-ASCII characters (if any) in the arguments to octal codes and set
+    # --PS_CHAR_ENCODING=encoding if necessary
+    if (encoding := _check_encoding("".join(gmt_args))) != "ascii":
+        gmt_args = [non_ascii_to_octal(arg, encoding=encoding) for arg in gmt_args]
+
+        # Set --PS_CHAR_ENCODING=encoding if necessary
+        if not (confdict and "PS_CHAR_ENCODING" in confdict):
+            gmt_args.append(f"--PS_CHAR_ENCODING={encoding}")
 
     if confdict:
         gmt_args.extend(f"--{key}={value}" for key, value in confdict.items())

pygmt/src/text.py

@@ -238,15 +238,12 @@ def text_(  # noqa: PLR0912
 
         # Append text to the last column. Text must be passed in as str type.
         text = np.asarray(text, dtype=np.str_)
-        encoding = _check_encoding("".join(text.flatten()))
-        if encoding != "ascii":
+        if (encoding := _check_encoding("".join(text.flatten()))) != "ascii":
             text = np.vectorize(non_ascii_to_octal, excluded="encoding")(
                 text, encoding=encoding
             )
+            confdict["PS_CHAR_ENCODING"] = encoding
         extra_arrays.append(text)
-
-        if encoding not in {"ascii", "ISOLatin1+"}:
-            confdict = {"PS_CHAR_ENCODING": encoding}
     else:
         if isinstance(position, str):
             kwargs["F"] += f"+c{position}+t{text}"