Use the definitions from (newer) upstream PEGTL.

diff --git a/include/gemmi/cif.hpp b/include/gemmi/cif.hpp
index c7ffdb44..35d24210 100644
--- a/include/gemmi/cif.hpp
+++ b/include/gemmi/cif.hpp
@@ -37,7 +37,6 @@ namespace pegtl = tao::pegtl;
 namespace rules {
 
   template<int TableVal> struct lookup_char {
-    using analyze_t = pegtl::analysis::generic<pegtl::analysis::rule_type::ANY>;
     template<typename Input> static bool match(Input& in) {
       if (!in.empty() && cif::char_table(in.peek_char()) == TableVal) {
         if (TableVal == 2)  // this set includes new-line
@@ -71,11 +70,11 @@ namespace rules {
   struct ws_or_eof : pegtl::sor<whitespace, pegtl::eof> {};
 
   // (b) Reserved words.
-  struct str_data : TAOCPP_PEGTL_ISTRING("data_") {};
-  struct str_loop : TAOCPP_PEGTL_ISTRING("loop_") {};
-  struct str_global : TAOCPP_PEGTL_ISTRING("global_") {};
-  struct str_save : TAOCPP_PEGTL_ISTRING("save_") {};
-  struct str_stop : TAOCPP_PEGTL_ISTRING("stop_") {};
+  struct str_data : TAO_PEGTL_ISTRING("data_") {};
+  struct str_loop : TAO_PEGTL_ISTRING("loop_") {};
+  struct str_global : TAO_PEGTL_ISTRING("global_") {};
+  struct str_save : TAO_PEGTL_ISTRING("save_") {};
+  struct str_stop : TAO_PEGTL_ISTRING("stop_") {};
   struct keyword : pegtl::sor<str_data, str_loop, str_global,
                               str_save, str_stop> {};
 
scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>commit</a><a href='/guix/diff/gnu/packages/inkscape.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/inkscape.scm'>
<input type='hidden' name='id' value='85ba5e9335207beef9a650e96d5d64787beb9256'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=85ba5e9335207beef9a650e96d5d64787beb9256'>root</a>/<a href='/guix/log/gnu?id=85ba5e9335207beef9a650e96d5d64787beb9256'>gnu</a>/<a href='/guix/log/gnu/packages?id=85ba5e9335207beef9a650e96d5d64787beb9256'>packages</a>/<a href='/guix/log/gnu/packages/inkscape.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>inkscape.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/inkscape.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-26 15:53:04 +0000'>2020-10-26</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=24b233d45c2a04a7a011397234b29fd5d7133110'>gnu: inkscape: Correct extension dependencies.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Add wrap-program phase.
[inputs]: Move python-wrapper to inputs, and add several python libraries.
[native-inputs]: Remove python-wrapper, as it has moved to inputs.

Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Ekaitz Zarraga</td></tr>
<tr><td><span title='2020-09-21 19:39:25 +0300'>2020-09-21</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=17d30d1f6e63054f3c9006ae110009d99156e7c8'>gnu: inkscape-1.0: Update to 1.0.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/inkscape.scm (inkscape-1.0): Update to 1.0.1.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;
</span></span></td><td>Boris A. Dekshteyn</td></tr>
<tr><td><span title='2020-06-14 23:16:33 -0400'>2020-06-14</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=1afa2c5ca0c5904bd9de70a48dd7d0a6275d5d3f'>gnu: inkscape: Add the glib-or-gtk-build-system phases.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes an issue where an improperly set XDG_DATA_DIRS environment variable
would cause a segfault when opening the 'Save As' menu of Inkscape.  See:
&lt;https://lists.gnu.org/archive/html/help-guix/2020-06/msg00093.html&gt;.

* gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Import the
(guix build glib-or-gtk-build-system) module.
[phases]: Add the glib-or-gtk-compile-schemas and glib-or-gtk-wrap phases.

Reported-by: Thorsten Wilms &lt;t_w_@freenet.de&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-05-31 22:12:13 -0400'>2020-05-31</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=ff8a1a88d934bb31339ad1c9aaa201ec837cb743'>gnu: inkscape: Add inkscape-1.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/inkscape.scm (inkscape-1.0): New variable.
* gnu/packages/gtk.scm (at-spi2-atk): Add a TODO comment.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-02-10 23:05:25 +0100'>2020-02-10</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=d930b0261ca1479505109332db28b0e3df452848'>gnu: inkscape: Remove obsolete workaround.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/inkscape.scm (inkscape)[arguments]: Remove phase
"dont-use-system-includes".
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-01-14 00:18:08 +0100'>2020-01-14</span></td><td><a href='/guix/commit/gnu/packages/inkscape.scm?id=1e5663e2e63e1e1dab116d3e84a7e5852922ed31'>gnu: poppler: Update to 0.84.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pdf.scm (poppler): Update to 0.84.0.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
'adjust-for-new-poppler'.
</span></span></td><td>Marius Bakke</td></tr>