Imported Upstream version 8.2.2

[platform/upstream/harfbuzz.git] / src / hb-buffer-deserialize-text-glyphs.rl

diff --git a/src/hb-buffer-deserialize-text.rl b/src/hb-buffer-deserialize-text-glyphs.rl
similarity index 62%
rename from src/hb-buffer-deserialize-text.rl
rename to src/hb-buffer-deserialize-text-glyphs.rl
index a217028..21db14b 100644 (file)
--- a/src/hb-buffer-deserialize-text.rl
+++ b/src/hb-buffer-deserialize-text-glyphs.rl
@@ -24,20 +24,20 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH
-#define HB_BUFFER_DESERIALIZE_TEXT_HH
+#ifndef HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH
+#define HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH
 
 #include "hb.hh"
 
 %%{
 
-machine deserialize_text;
+machine deserialize_text_glyphs;
 alphtype unsigned char;
 write data;
 
 action clear_item {
-       memset (&info, 0, sizeof (info));
-       memset (&pos , 0, sizeof (pos ));
+       hb_memset (&info, 0, sizeof (info));
+       hb_memset (&pos , 0, sizeof (pos ));
 }
 
 action add_item {
@@ -52,35 +52,32 @@ action tok {
        tok = p;
 }
 
-action ensure_glyphs { if (unlikely (!buffer->ensure_glyphs ())) return false; }
-action ensure_unicode { if (unlikely (!buffer->ensure_unicode ())) return false; }
-
 action parse_glyph {
-       /* TODO Unescape delimeters. */
+       /* TODO Unescape delimiters. */
        if (!hb_font_glyph_from_string (font,
                                        tok, p - tok,
                                        &info.codepoint))
          return false;
 }
 
-action parse_hexdigits  {if (!parse_hex (tok, p, &info.codepoint )) return false; }
-
-action parse_cluster   { if (!parse_uint (tok, p, &info.cluster )) return false; }
-action parse_x_offset  { if (!parse_int  (tok, p, &pos.x_offset )) return false; }
-action parse_y_offset  { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
-action parse_x_advance { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
-action parse_y_advance { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
+action parse_cluster   { if (!parse_uint (tok, p, &info.cluster )) return false; }
+action parse_x_offset  { if (!parse_int  (tok, p, &pos.x_offset )) return false; }
+action parse_y_offset  { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
+action parse_x_advance { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
+action parse_y_advance { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
+action parse_glyph_flags{ if (!parse_uint (tok, p, &info.mask    )) return false; }
 
 unum  = '0' | [1-9] digit*;
 num    = '-'? unum;
 
 glyph_id = unum;
-glyph_name = ([^\\\]=@+,|] | '\\' [\\\]=@+,|]) *;
+glyph_name = ([^\\\]=@+,#|] | '\\' [\\\]=@+,|]) *;
 
 glyph  = (glyph_id | glyph_name) >tok %parse_glyph;
 cluster        = '=' (unum >tok %parse_cluster);
 offsets        = '@' (num >tok %parse_x_offset)   ',' (num >tok %parse_y_offset );
 advances= '+' (num >tok %parse_x_advance) (',' (num >tok %parse_y_advance))?;
+glyphflags= '#' (unum >tok %parse_glyph_flags);
 
 glyph_item     =
        (
@@ -88,47 +85,48 @@ glyph_item  =
                cluster?
                offsets?
                advances?
+               glyphflags?
        )
        >clear_item
-       @ensure_glyphs
-       %add_item
-       ;
-
-unicode = 'U' '+' xdigit+ >tok %parse_hexdigits;
-
-unicode_item   =
-       (
-               unicode
-               cluster?
-       )
-       >clear_item
-       @ensure_unicode
        %add_item
        ;
 
-glyphs = glyph_item (space* '|' space* glyph_item)* space* ('|'|']')?;
-unicodes = unicode_item (space* '|' space* unicode_item)* space* ('|'|'>')?;
+glyphs = glyph_item (space* '|' space* glyph_item)* space*;
 
-main := space* ( ('[' glyphs) | ('<' unicodes) );
+main := space* glyphs;
 
 }%%
 
 static hb_bool_t
-_hb_buffer_deserialize_text (hb_buffer_t *buffer,
+_hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
                                    const char *buf,
                                    unsigned int buf_len,
                                    const char **end_ptr,
                                    hb_font_t *font)
 {
-  const char *p = buf, *pe = buf + buf_len;
+  const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
 
   /* Ensure we have positions. */
   (void) hb_buffer_get_glyph_positions (buffer, nullptr);
 
   while (p < pe && ISSPACE (*p))
     p++;
-
-  const char *eof = pe, *tok = nullptr;
+  if (p < pe && *p == (buffer->len ? '|' : '['))
+    *end_ptr = ++p;
+
+  const char *end = strchr ((char *) p, ']');
+  if (end)
+    pe = eof = end;
+  else
+  {
+    end = strrchr ((char *) p, '|');
+    if (end)
+      pe = eof = end;
+    else
+      pe = eof = p;
+  }
+
+  const char *tok = nullptr;
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
@@ -137,9 +135,16 @@ _hb_buffer_deserialize_text (hb_buffer_t *buffer,
     write exec;
   }%%
 
+  if (pe < orig_pe && *pe == ']')
+  {
+    pe++;
+    if (p == pe)
+      p++;
+  }
+
   *end_ptr = p;
 
-  return p == pe && *(p-1) != ']';
+  return p == pe;
 }
 
-#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */
+#endif /* HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH */