Update upstream source from tag 'upstream/1.0'

Update to upstream version '1.0'
with Debian dir 4875e7dc9f7277205f0086a63ee21ccdb1d54593

1 files changed, 162 insertions, 10 deletions

diff --git a/tests/unilbrk/test-u8-possible-linebreaks.c b/tests/unilbrk/test-u8-possible-linebreaks.c
index 7e1b4c5..3640e56 100644
--- a/tests/unilbrk/test-u8-possible-linebreaks.c
+++ b/tests/unilbrk/test-u8-possible-linebreaks.c
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-8 strings.
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2022 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,11 +24,12 @@
 
 #include "macros.h"
 
-int
-main ()
+static void
+test_function (void (*my_u8_possible_linebreaks) (const uint8_t *, size_t, const char *, char *_UC_RESTRICT),
+               int version)
 {
   /* Test case n = 0.  */
-  u8_possible_linebreaks (NULL, 0, "GB18030", NULL);
+  my_u8_possible_linebreaks (NULL, 0, "GB18030", NULL);
 
   {
     static const uint8_t input[91] =
@@ -39,13 +40,13 @@ main ()
       char *p = (char *) malloc (SIZEOF (input));
       size_t i;
 
-      u8_possible_linebreaks (input, SIZEOF (input), "GB18030", p);
+      my_u8_possible_linebreaks (input, SIZEOF (input), "GB18030", p);
       for (i = 0; i < 91; i++)
         {
           ASSERT (p[i] == (i == 90 ? UC_BREAK_MANDATORY :
                            i == 7
                            || i == 13 || i == 39
-                           || i == 43 || i == 44
+                           || i == 43
                            || i == 61 || i == 67
                            || i == 70 || i == 73 || i == 77 || i == 80
                            || i == 84 || i == 87 ? UC_BREAK_POSSIBLE :
@@ -58,13 +59,13 @@ main ()
       char *p = (char *) malloc (SIZEOF (input));
       size_t i;
 
-      u8_possible_linebreaks (input, SIZEOF (input), "GB2312", p);
+      my_u8_possible_linebreaks (input, SIZEOF (input), "GB2312", p);
       for (i = 0; i < 91; i++)
         {
           ASSERT (p[i] == (i == 90 ? UC_BREAK_MANDATORY :
                            i == 7
                            || i == 13 || i == 39
-                           || i == 43 || i == 44
+                           || i == 43
                            || i == 52 || i == 61 || i == 67
                            || i == 70 || i == 73 || i == 77 || i == 80
                            || i == 84 || i == 87 ? UC_BREAK_POSSIBLE :
@@ -74,6 +75,22 @@ main ()
     }
   }
 
+  /* CR LF handling.  */
+  {
+    static const uint8_t input[8] = "a\nb\rc\r\nd";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 8; i++)
+      {
+        ASSERT (p[i] == (i == 1 || i == 3 || i == 6 ? UC_BREAK_MANDATORY :
+                         i == 5 ? (version < 2 ? UC_BREAK_MANDATORY : UC_BREAK_CR_BEFORE_LF) :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
   /* Test that a break is possible after a zero-width space followed by some
      regular spaces (rule LB8 in Unicode TR#14 revision 26).  */
   {
@@ -81,13 +98,148 @@ main ()
     char *p = (char *) malloc (SIZEOF (input));
     size_t i;
 
-    u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
-    for (i = 0; i < 4; i++)
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 6; i++)
       {
         ASSERT (p[i] == (i == 5 ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED));
       }
     free (p);
   }
 
+  /* Test line breaking in a string with HTML markup.  */
+  {
+    static const uint8_t input[21] = "<P>Some sentence.</P>";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 21; i++)
+      {
+        ASSERT (p[i] == (i == 8 || i == 17 || i == 19 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test line breaking of combining marks.  */
+  {
+    static const uint8_t input[24] =
+      "a\314\200\314\201e\314\200 \314\201o \314\200 o\302\240\314\200\n"
+      "\314\200";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 24; i++)
+      {
+        ASSERT (p[i] == (i == 21 ? UC_BREAK_MANDATORY :
+                         i == 9 || i == 13 || i == 16 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test line breaking of zero-width joiners (U+200D).  */
+  {
+    static const uint8_t input[101] =
+      "\346\234\211\347\204\241\347\252\256\345\244\232\345\200\213\347\264\240\346\225\270\343\200\202\n" /* "有無窮多個素數。" */
+      "\346\234\211\342\200\215\347\204\241\342\200\215\347\252\256\345\244\232\345\200\213\347\264\240\342\200\215\346\225\270\343\200\202\n"
+      "\344\275\240\342\200\224\344\270\215\n" /* "你—不" */
+      "\344\275\240\342\200\224\342\200\215\344\270\215\n"
+      "\342\230\235\360\237\217\277\n" /* "☝🏿" */
+      "\342\230\235\342\200\215\360\237\217\277\n";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 101; i++)
+      {
+        ASSERT (p[i] == (i == 24 || i == 58
+                         || i == 68 || i == 81
+                         || i == 89 || i == 100 ? UC_BREAK_MANDATORY :
+                         i == 3 || i == 6 || i == 9 || i == 12 || i == 15 || i == 18
+                         || i == 40 || i == 43 || i == 46
+                         || i == 62 || i == 65
+                         || i == 72 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test line breaking of regional indicators.  */
+  {
+    static const uint8_t input[16] =
+      "\360\237\207\251\360\237\207\252\360\237\207\253\360\237\207\267";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 16; i++)
+      {
+        ASSERT (p[i] == (i == 8 ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test special behaviour of hyphen/break-after character after
+     Hebrew letter.  */
+  {
+    static const uint8_t input[15] = /* "ab-אב-αβ-ω" */
+      "ab-\327\220\327\221-\316\261\316\262-\317\211";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 15; i++)
+      {
+        ASSERT (p[i] == (i == 3 || i == 13 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test special behaviour before East Asian opening parenthesis (LB30).  */
+  {
+    static const uint8_t input[49] = /* "日中韓統合漢字拡張G「ユニコード」" */
+      "\346\227\245\344\270\255\351\237\223\347\265\261\345\220\210\346\274\242"
+      "\345\255\227\346\213\241\345\274\265G\343\200\214\343\203\246"
+      "\343\203\213\343\202\263\343\203\274\343\203\211\343\200\215";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 49; i++)
+      {
+        ASSERT (p[i] == (i == 3 || i == 6 || i == 9 || i == 12 || i == 15
+                         || i == 18 || i == 21 || i == 24 || i == 27
+                         || i == 28 /* This is the desired break position.  */
+                         || i == 34 || i == 37 || i == 43 ? UC_BREAK_POSSIBLE :
+                         UC_BREAK_PROHIBITED));
+      }
+    free (p);
+  }
+
+  /* Test special behaviour of potential future emoji (LB30b).  */
+  {
+    static const uint8_t input[8] = "\360\237\277\274\360\237\217\277";
+    char *p = (char *) malloc (SIZEOF (input));
+    size_t i;
+
+    my_u8_possible_linebreaks (input, SIZEOF (input), "UTF-8", p);
+    for (i = 0; i < 8; i++)
+      {
+        ASSERT (p[i] == UC_BREAK_PROHIBITED);
+      }
+    free (p);
+  }
+}
+
+int
+main ()
+{
+  test_function (u8_possible_linebreaks, 2);
+#undef u8_possible_linebreaks
+  test_function (u8_possible_linebreaks, 1);
+
   return 0;
 }