[gtk: 19/19] Merge branch 'wip/compose-parser' into 'master'




commit 5c4aba4b9c9dab31aae9e35a0b7333c273c892b7
Merge: 39005461c5 87e2a02e0c
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 26 11:51:14 2021 +0000

    Merge branch 'wip/compose-parser' into 'master'
    
    Clean up the GtkComposeTable api
    
    See merge request GNOME/gtk!3746

 gtk/compose/chars                        |  Bin 0 -> 1573 bytes
 gtk/compose/compose-parse.c              |   63 +
 gtk/compose/compose-parse.py             |  984 ------
 gtk/compose/gtk-compose-lookaside.txt    |  405 ---
 gtk/compose/gtkcomposedata.h             |    9 +
 gtk/compose/meson.build                  |    7 +
 gtk/compose/sequences                    |  Bin 0 -> 33042 bytes
 gtk/gen-gtk-gresources-xml.py            |    2 +
 gtk/gtkcomposetable.c                    | 1150 ++++---
 gtk/gtkcomposetable.h                    |   77 +-
 gtk/gtkimcontextsimple.c                 |  206 +-
 gtk/gtkimcontextsimple.h                 |    8 +-
 gtk/meson.build                          |    2 +
 testsuite/gtk/compose/basic.expected     |    5 +-
 testsuite/gtk/compose/codepoint.expected |    5 +-
 testsuite/gtk/compose/comments.expected  |    5 +-
 testsuite/gtk/compose/cycle              |    3 +
 testsuite/gtk/compose/hex.expected       |    5 +-
 testsuite/gtk/compose/include            |    4 +
 testsuite/gtk/compose/include.expected   |    6 +
 testsuite/gtk/compose/included           |    2 +
 testsuite/gtk/compose/long.expected      |    5 +-
 testsuite/gtk/compose/match.expected     |    9 +-
 testsuite/gtk/compose/multi.expected     |    9 +-
 testsuite/gtk/compose/nofile             |    3 +
 testsuite/gtk/compose/octal.expected     |    5 +-
 testsuite/gtk/compose/strings.expected   |    9 +-
 testsuite/gtk/compose/system             |    1 +
 testsuite/gtk/compose/system.expected    | 4914 ++++++++++++++++++++++++++++++
 testsuite/gtk/composetable.c             |  192 +-
 30 files changed, 6097 insertions(+), 1998 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]