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=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>commit</a><a href='/guix/diff/po/doc/guix-manual.ru.po?id=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/doc/guix-manual.ru.po'>
<input type='hidden' name='id' value='0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'/><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=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>root</a>/<a href='/guix/log/po?id=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>po</a>/<a href='/guix/log/po/doc?id=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>doc</a>/<a href='/guix/log/po/doc/guix-manual.ru.po?id=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524'>guix-manual.ru.po</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/po/doc/guix-manual.ru.po?id=0e407e53dfb5f6bf7bc57cbe7ffa46db1af45524&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-03-01 22:17:18 +0100'>2022-03-01</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=8c92d85e06e65c5cdb5f6c75faf8aa33e5a68513'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.uk.po: New file.
* po/doc/local.mk: Add uk cookbook.
* doc/local.mk: Add uk cookbook.
* po/guix/fa.po: New file.
* po/guix/uk.po: New file.
* po/guix/LINGUAS: Add fa and uk.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-02-04 18:29:00 +0100'>2022-02-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=8391a99d089322a39cbacb1e6dc2979d8b2ef7c9'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add it.
* doc/local.mk: Add pt_BR cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-01-09 11:35:59 +0100'>2022-01-09</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=934b0cdfee2078bad42429427e12d6ee2ddb7fec'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.fi.po: New file.
* po/doc/guix-manual.fi.po: New file.
* po/doc/local.mk: Add them.
* doc/local.mk: Add them.
* po/guix/fi.po: New file.
* po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-12-04 19:40:52 +0100'>2021-12-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=7fcb20a8fa242ab53b9bc97ef0b0367c6a399bd4'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-11-06 14:06:36 +0100'>2021-11-06</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=85430a9ea6f32aaae3e34741e292a01a2de62ee0'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.es.po: New file.
* po/doc/local.mk: Add 'es' cookbook.
* doc/local.mk: Add 'es' cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-10-17 22:10:25 +0200'>2021-10-17</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=15c91189cb61c579f4289047c79530cefe75215f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/it.po: New file.
* po/packages/LINGUAS: Add `it'.
* po/*/*.po: Update translations.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-08-04 14:49:53 +0200'>2021-08-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=6c10c96fedf707d7be059aeb79bd5c8e2d2fa210'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.ru.po: New file.
* po/doc/guix-cookbook.sk.po: New file.
* po/*/*.po: Update translations.
* doc/local.mk (COOKBOOK_LANGUAGES): Add ru and sk.
(info_TEXINFOS): Add Russian and Slovak cookbooks.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): Add Russian and Slovak po
files.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-05-10 22:34:43 -0400'>2021-05-10</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=21fcced608c93e1ac836cdd9ab8c5d200c667e75'>nls: Update translations.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-18 13:18:34 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=0cfe02cf55baf8ef1395bc8f108672159355f606'>nls: Update 'ru' translation.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-11-05 16:42:38 +0100'>2020-11-05</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=eff2cabdde1077928868d06ac197f03f114f03fe'>nls: Update translations of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-10-29 20:19:05 +0100'>2020-10-29</span></td><td><a href='/guix/commit/po/doc/guix-manual.ru.po?id=759774bc69e91c9db6f5070b75d5a5fe9b36c04b'>nls: Update 'ru' translation of the manual.</a></td><td>Julien Lepiller</td></tr>