branch master updated: * tp/Texinfo/XS/XSParagraph.xs (xspara_add_text, xspara_add_next): use SvPVutf8.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 5012ae9253 * tp/Texinfo/XS/XSParagraph.xs (xspara_add_text, 
xspara_add_next): use SvPVutf8.
5012ae9253 is described below

commit 5012ae9253cd70211b81a9c6ac5ee5e1b8833293
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Nov 14 23:07:34 2024 +0100

    * tp/Texinfo/XS/XSParagraph.xs (xspara_add_text, xspara_add_next):
    use SvPVutf8.
---
 ChangeLog                    |  5 +++++
 tp/Texinfo/XS/XSParagraph.xs | 13 ++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32ecbb2ed1..4adf8ec06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-11-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/XSParagraph.xs (xspara_add_text, xspara_add_next):
+       use SvPVutf8.
+
 2024-11-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/XSParagraph.xs (xspara_new): iterate over the conf
diff --git a/tp/Texinfo/XS/XSParagraph.xs b/tp/Texinfo/XS/XSParagraph.xs
index f5f13f840e..43d80fb3a3 100644
--- a/tp/Texinfo/XS/XSParagraph.xs
+++ b/tp/Texinfo/XS/XSParagraph.xs
@@ -164,12 +164,7 @@ xspara_add_text (int paragraph, text_in)
         STRLEN text_len;
         TEXT retval;
     CODE:
-        /* Always convert the input to UTF8 with sv_utf8_upgrade, so we can 
-           process it properly in xspara_add_next. */
-        if (!SvUTF8 (text_in))
-          sv_utf8_upgrade (text_in);
-
-        text = SvPV (text_in, text_len);
+        text = SvPVutf8 (text_in, text_len);
 
         xspara_set_state (paragraph);
         retval = xspara_add_text (text, text_len);
@@ -199,11 +194,7 @@ xspara_add_next (int paragraph, text_in, ...)
               transparent = (int)SvIV(arg_in);
           }
 
-        /* Always convert the input to UTF8 with sv_utf8_upgrade, so we can 
-           process it properly in xspara_add_next. */
-        if (!SvUTF8 (text_in))
-          sv_utf8_upgrade (text_in);
-        text = SvPV (text_in, text_len);
+        text = SvPVutf8 (text_in, text_len);
 
         xspara_set_state (paragraph);
         retval = xspara_add_next (text, text_len, transparent);