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> {};
 
d=4a0399e277fd76dea018dfc216c30f9ffc16104c'>commit</a><a href='/guix/diff/gnu/installer/keymap.scm?id=4a0399e277fd76dea018dfc216c30f9ffc16104c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/keymap.scm'>
<input type='hidden' name='id' value='4a0399e277fd76dea018dfc216c30f9ffc16104c'/><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=4a0399e277fd76dea018dfc216c30f9ffc16104c'>root</a>/<a href='/guix/log/gnu?id=4a0399e277fd76dea018dfc216c30f9ffc16104c'>gnu</a>/<a href='/guix/log/gnu/installer?id=4a0399e277fd76dea018dfc216c30f9ffc16104c'>installer</a>/<a href='/guix/log/gnu/installer/keymap.scm?id=4a0399e277fd76dea018dfc216c30f9ffc16104c'>keymap.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/installer/keymap.scm?id=4a0399e277fd76dea018dfc216c30f9ffc16104c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-04-17 15:13:31 +0200'>2019-04-17</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=818595a974a3fc9caa7edd8a4f19d5485c91caba'>installer: Parse the 'shortDescription' field from xkeyboard-config.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-17 14:04:25 +0100'>2019-01-17</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=479414e1c9e13ddce9e0c8741eb9f50dff62e333'>installer: keymap: Do not fail on non-kmscon terminals.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2019-01-17 14:04:23 +0100'>2019-01-17</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=c088b2e47f6675199f1ef545df7d04d4532e64e3'>installer: Do not ask for keyboard model.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2019-01-17 14:04:20 +0100'>2019-01-17</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=d0f3a672dcbdfefd3556b6a21985ff0e35eed3be'>gnu: Add graphical installer support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>